gentoo resync : 09.03.2018

46 files changed, 371 insertions, 273 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 4e01d7ab9157..924291ab7d86 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index f1bbfcff1b88..14ae21059039 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -2,7 +2,7 @@ AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c
 DIST alsa-tools-1.1.0.tar.bz2 1715113 BLAKE2B 9b64f3a78e0cff212663c716c189591cd249e58992e5b403e8948b0fa81c4b3b86cc4872f4dcb7a0fadf9cb313043201549b10f3a36d546911bba18fe9fc3602 SHA512 caabbc9a8b494de6bba0dea6440b335b35e5c7dab4942ac36f127a75c2212ff98e7e38566444666edcf40c6c95e6d9797c421014fb5c5c292bb398780e6c9f87
 DIST alsa-tools-1.1.3.tar.bz2 1715759 BLAKE2B c267c746b1b6e986d65e4f69874eb8432e141e823112037ac21f6c794275c818d66dc8adb680c62eb72621d6d6b0974efaffadcf5b7dd7aea53c4c1528631c14 SHA512 b7c6c7639ea30fd8385c817fcd9dee4e5ed7c5766801d11a61d94f3211db4f99ecc0f00173573b69724ad9a06138605c353f4a40c8631eb4325b9718788bea50
 DIST alsa-tools-1.1.5.tar.bz2 1715977 BLAKE2B a8608d19794f7072959121a5f6ab8a7f676d600706bcf52d7e0ec770947fa85948927c1967d4ed35befd31f3bf1b66633ae107274b11490b4bb4558d434c4f80 SHA512 42463540def2260bda0fdb0b08a665ef336deb817920605ce8f77b4904595eadc7d4774d799385bb2271026e26976cc733a776b228814d2c7d7651c46a45098d
-EBUILD alsa-tools-1.1.0.ebuild 3494 BLAKE2B 64b711ddf342cda601d3a45abc50cc4b7929b7873c949289bb73e8c3ae04a87d74c5bd08e385fdbac6d20f4d87d1816704f81dbf80850c3c2659c546ffb8397e SHA512 de303225bc4025bf28a1adb7b0994b2c10e81ecd8281e272ee6a4d66c1c226fabbd22df3fa27b739dec539c19228ea635378e18ebf49fec857c06afa9d215884
-EBUILD alsa-tools-1.1.3.ebuild 3500 BLAKE2B 5808a1b01e6cdd2153c8491287689d090a448442cfe3213da128222033e9a1d6c7ef18c806361b02c56199494648311b43c7fb3f0c24385d0d3d93273677c938 SHA512 a34983b53de21d18ffa577507cf4ef91f63d71e3e7167cc8206abf93a2eed4f6401ee06e2fec227a27c23d253b6edc5c9354b6536985757afe5438bc5cff4631
-EBUILD alsa-tools-1.1.5.ebuild 3500 BLAKE2B fa83e938f6c007b5663025aeac5aec3893c03e2cf0ea8a3e6e306e2ab4b2850b6422923ea5e3dcb666753c7abd9e0a61595df2d2a0ac8d05e57b358dff9f26ac SHA512 232d2eeff2323ef9a0ba91e7f868f74f7c2ff56fb90a929a915c7ab1b6402fe4821b613fe80bd993cdc5b853f60e8f5d0f19c6ac29d07ab4b89fa625e7b4d2d0
+EBUILD alsa-tools-1.1.0.ebuild 3491 BLAKE2B 6c4c591a1025f18d1b8e7e2058fbb227f200ec5c50334ae400a9cff94d5630d05f5298faf91c2c76451b09ef9b90d1e3b1b04aad70871eb79d55a6f66b683f53 SHA512 704b16d093923c138ea05bfbeebd96be74987ea0ea076f40e2260e32765074bbde1bfe08f3b231fc6fb6b7b32a5eb2241c980f9d62294475df8e848e46393284
+EBUILD alsa-tools-1.1.3.ebuild 3497 BLAKE2B 247f1a79678b2a6f647da73c5e523a95d62565d66eebce000e5987adaa92995d5066e859c688ed7b7197939bf3e9ecb0b031e33d2c30dece41219d6eacf01459 SHA512 0c9bafd1470f61f189a19de82a7bbcafaeb9c195edb13632f63c846f5a248d755f668592025afd427719ea1d79223baafe994fac24b5b1a3fe6daffa5d81a60e
+EBUILD alsa-tools-1.1.5.ebuild 3497 BLAKE2B 247f1a79678b2a6f647da73c5e523a95d62565d66eebce000e5987adaa92995d5066e859c688ed7b7197939bf3e9ecb0b031e33d2c30dece41219d6eacf01459 SHA512 0c9bafd1470f61f189a19de82a7bbcafaeb9c195edb13632f63c846f5a248d755f668592025afd427719ea1d79223baafe994fac24b5b1a3fe6daffa5d81a60e
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
index 3133ebb17a04..e2b9d265a6c6 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="http://www.alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/"
 SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.3.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.3.ebuild
index 39e145485219..972e14d4b033 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.3.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="http://www.alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/"
 SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild
index 9e80bd439216..972e14d4b033 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="http://www.alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/"
 SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 65eab14f08c7..580231d123dc 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -5,7 +5,7 @@ AUX alsasound.initd-r7 2190 BLAKE2B af02158bfa5d74c174cb5efbb8dff4c0b51ff856d7b4
 DIST alsa-utils-1.1.2.tar.bz2 1193140 BLAKE2B 8c9d3baae1530a399299379963e68c50d2d4fca63045b7c59b14240d5ad6316c37f1c7d6f4a7fa2cfeb8e5ae561440b9ad689475e006ab1fcaea2065b7c33015 SHA512 38dc3331e8410123085738e74ca34c860666027ee2f6aaa21f48e726c84d8e6264043c8c7111ce2b1e158a0f38142a04d72a128ee54e00173dc4e4ba514d2f14
 DIST alsa-utils-1.1.4.tar.bz2 1202047 BLAKE2B 5da3c543ef6056b99ed56975211a0a788e0672160f21b7579e4f9d6d192b655d81a1350f096ff35547f89c7353532523c592d44cf3d5a740cd2189cb9626144d SHA512 96852b3f5b57d7d9078a20881f28311543d446b69c80450179823a225089df7306456991890a7ef37672c1f55e9c386a7731c94e125504dcda2c88a674c8b4c7
 DIST alsa-utils-1.1.5.tar.bz2 1202691 BLAKE2B 2a30079775d7d0abb8e2036f2e2569b392920bd5f60ec5361b9b69d3f1cc1d277225318c7e0c477c6d9608a3c45430cd1e2030069e4cdf1f960a7631985f9eab SHA512 102e9ed34b89219dbad243ad5f61ca65fb8101502566c02f40d4e69abb45baa7a60f24440de1417e0f0e7f55b28db53d365d53a59af11f1ca816e2aa5907153d
-EBUILD alsa-utils-1.1.2.ebuild 2202 BLAKE2B 94725434c49203de9d90d3ef48a6ff83877c88329752882402e52e973319c11af5e0c1f196376663131ce52aa7898483d2e91576cdc19da0012537e99ff0dedd SHA512 02849a9039acdd22f0d1fd6d0b322dced2ed368d4fa9982ef24beee44ae6f1b9c76bd5dd49910115c44048eb949964de31a75f0c44c400f66f4e9a21e13b5a4c
-EBUILD alsa-utils-1.1.4-r1.ebuild 2276 BLAKE2B 17f210d852a89ceeb82f286076a7bef988b32b64d7ab47a1271d18157a21b2cbbd3285dd5ab4db0c177a6938681b23bc5e2a6882ab9e2ac5d7add6bf24af0c93 SHA512 d79feb69c4e942c2ccfaa012fa07f2d766030cffeb70b1b114b40e1c87d732826e355f2dc811d293bd7a7f3770076408241864e0bf543eb4095f473265bf06ba
-EBUILD alsa-utils-1.1.5.ebuild 2276 BLAKE2B 17f210d852a89ceeb82f286076a7bef988b32b64d7ab47a1271d18157a21b2cbbd3285dd5ab4db0c177a6938681b23bc5e2a6882ab9e2ac5d7add6bf24af0c93 SHA512 d79feb69c4e942c2ccfaa012fa07f2d766030cffeb70b1b114b40e1c87d732826e355f2dc811d293bd7a7f3770076408241864e0bf543eb4095f473265bf06ba
+EBUILD alsa-utils-1.1.2.ebuild 2199 BLAKE2B 110899e375e20f25067db6dcc21b3302ac119dc9656c88946f0fa304084571f61ab6335536336d874dedad465dfcb0b4b1c39e3a7b0b502082dbb90ca5a32abf SHA512 e0253fbba1c48e7318d5b9ab5bceebccd303ac09e6e2687a3947788e90491a7c88952209128ece17ffeb6255330118d3a43e245513e4c1dca9254bbeed72394f
+EBUILD alsa-utils-1.1.4-r1.ebuild 2273 BLAKE2B 567cf0b992c725bc555df0c9b437b4985c70679c0ff0768ecbd9086873ab5d3aba25bdd5ba1ed6e1520423659512da68618b6d1e441b80fe8d33379d0550c647 SHA512 170a3d59d02f65d33647eaf70f28f354c725fe11087c640e6917fc9c51a02540ecb2461da224e2c70282010869edadc6399252f04fcc8c70d6faab5be07dfc08
+EBUILD alsa-utils-1.1.5.ebuild 2273 BLAKE2B 567cf0b992c725bc555df0c9b437b4985c70679c0ff0768ecbd9086873ab5d3aba25bdd5ba1ed6e1520423659512da68618b6d1e441b80fe8d33379d0550c647 SHA512 170a3d59d02f65d33647eaf70f28f354c725fe11087c640e6917fc9c51a02540ecb2461da224e2c70282010869edadc6399252f04fcc8c70d6faab5be07dfc08
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
index f8e171a61f91..17f2f59fdab6 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="http://www.alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/"
 SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.4-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.4-r1.ebuild
index 87137657c10e..acbfd5824ecf 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.4-r1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.4-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="http://www.alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/"
 SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.5.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.5.ebuild
index 87137657c10e..acbfd5824ecf 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.5.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="http://www.alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/"
 SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/bpmdetect/Manifest b/media-sound/bpmdetect/Manifest
index b8ecd86312e1..db58e3d91e79 100644
--- a/media-sound/bpmdetect/Manifest
+++ b/media-sound/bpmdetect/Manifest
@@ -1,6 +1,3 @@
-AUX bpmdetect-0.6.1-fix-buildsystem.patch 1903 BLAKE2B e4b21370c9b668ce30927f744294e93b552a2cbe9e04277782294bfac54651ea4c1d2c68cc76c7cde1635d3929719871bd7aa4124c97cdbfaf7b85419a194fc2 SHA512 52500e1be213b19d2081e5a0d444afb3f55c955ba29fddd9c799cfe0d2359962c19fc64bc8d6649e8a5261fbf9ec8f16efe83b7decdbcf5b71abfd3ecbf15a4d
-AUX bpmdetect-0.6.1-fix-printf-format.patch 1328 BLAKE2B 0182a1e8027730326a20256a5dbbbd873fa8474743414a865d9c73aa44dbc18c0ec2f34cb7edada9677d8c098243e4c89fad780afd5c2ea450b88b09fef05991 SHA512 fa12b7daaf76e04d20b2a681e4e0849e99c93f2aa7a750aadec32c57d478d97005db294e1b613c29f7ad707a361b120863bf3dd69c18dac1be2bf8cbd61d9254
-AUX bpmdetect-0.6.1-gcc44_and_fmodex_path.patch 1439 BLAKE2B 112d8186f61e368d495699fde536c576db923a9141efa9de06cf0f713b5e2b34777ae2c9da49550cc1e46e06f71dfae0e6ada372da7eaf771b8cf80e7eea8f49 SHA512 abd719d7bb3f6bd773643b6cf082fcd7cb39f48d5f6a4143d5f6ec650e2496f97a311ef9c8f762622e04aeea7fbbe79cd7941615499ce655ab434ae69b46d297
-DIST bpmdetect-0.6.1-src.tar.bz2 1433211 BLAKE2B e77d4d18dbcd935c259e9a5ed44a7719656dd5147004c121ec4dcc05e7b067ae423f2e1b3f3ff27405837278468b7a3063cd4362324d4608870d762594ceed55 SHA512 9018b81d4ccca94d000a304ae640b071a0ac748c9c7922f4d3c6894a647594dd712964870898e01ee1d93fb8890491ed62b1d4e5f60f07dae74bda7525f0672a
-EBUILD bpmdetect-0.6.1-r1.ebuild 945 BLAKE2B 27e52a670709f51988b2eac0500ab16b75b54357dca44345745e6e842a9a88b50ab8943c8799947de8cc0fb0097e92546b6565626fc8cf21c6bca2a114990f73 SHA512 883cd4d0ae80882d5039804398bb8740bc1cf04dab86d4afab56ddb3768b4e22519fd49253909fe8f93de8fd65cabad18aad0a25e5a3932b54faf896a7344238
+DIST bpmdetect-0.7.0_pre20170810.tar.gz 257777 BLAKE2B 8a6cfa43b70883d3bf03328c9e52a642140c5a25cd72ea5a9515394551e2ae108135b284b788e12a53e79cb0e2fd916d35a27d743558abb996ad5eb5db7beb45 SHA512 a2bbb67c2e5c46b08396e85fd4b91a5fa8622222929a4a67abdcb4587f04f1d8f40414800cb476f7aaa66d95571dd2d65332e48ed639b621a4351f70ab545779
+EBUILD bpmdetect-0.7.0_pre20170810.ebuild 721 BLAKE2B 260d5a4953ae75e44a219911bb9105ef3f835e465e75e10a2449f39da656c520d884134cac96d6383ccd83472f47ecad56340e5c77cd687f9c0cb687e98e6d04 SHA512 d0ca38ba6f3e489576be488c7c946be6116a539771311f55b3635c98316532fc2bef7a73d51d4688e62ef9081ee02c07a4edc8c993d091a07247b2fc41b09bf0
 MISC metadata.xml 332 BLAKE2B 85eb37ef9ed0b6efcb8611d66b7d8087424e848bd60b819dc3b095480066de0d64d98fc95de3324542e160bdfd9007c80c6391327681df383c03bac26c83754c SHA512 7a6f93e001d436f33d8ee55b467eb2e398b65193ee0c77c0d087916372cba7a5b9693d15aec27e738ea05d54901c1f4f855722384bb9f86d59e10b7d6b6b17d7
diff --git a/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild b/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild
deleted file mode 100644
index 03402a37eec2..000000000000
--- a/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils scons-utils toolchain-funcs
-
-DESCRIPTION="Automatic BPM detection utility"
-HOMEPAGE="https://sourceforge.net/projects/bpmdetect"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/taglib
-	media-libs/id3lib
-	>=media-libs/fmod-4.25.07-r1:1
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	dev-util/scons
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}
-PATCHES=(
-	"${FILESDIR}/${P}-gcc44_and_fmodex_path.patch"
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
-	"${FILESDIR}/${P}-fix-printf-format.patch"
-)
-
-src_configure() {
-	myscons=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		QTDIR="/usr/$(get_libdir)"
-		prefix="${D}/usr"
-	)
-}
-
-src_compile() {
-	escons "${myscons[@]}"
-}
-
-src_install() {
-	escons "${myscons[@]}" install
-	dodoc authors readme todo
-}
diff --git a/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
new file mode 100644
index 000000000000..3f77ce8b3634
--- /dev/null
+++ b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=b13aac15904c1f821b1739d00445f49432705387
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="Automatic BPM detection utility"
+HOMEPAGE="https://github.com/Tatsh/bpmdetect"
+SRC_URI="https://github.com/Tatsh/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	media-libs/flac
+	media-libs/libmad
+	media-libs/libvorbis
+	media-libs/portaudio
+	media-libs/taglib
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_install() {
+	einstalldocs
+	dobin "${BUILD_DIR}"/src/${PN}
+}
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch
deleted file mode 100644
index fa6c0e59db68..000000000000
--- a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-* Fix QA issues in desktop file
-* Make buildsystem respect CXX, CXXFLAGS and LDFLAGS
-https://bugs.gentoo.org/show_bug.cgi?id=334465
-
---- bpmdetect/src/bpmdetect.desktop
-+++ bpmdetect/src/bpmdetect.desktop
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- Name=BPMDetect
- Exec=bpmdetect
--Icon=bpmdetect-icon.png
-+Icon=bpmdetect-icon
- Type=Application
- Comment=Automatic BPM detection utility
--Categories=Application;AudioVideo;Audio:
-+Categories=AudioVideo;Audio;
---- bpmdetect/src/SConscript
-+++ bpmdetect/src/SConscript
-@@ -1,5 +1,6 @@
- #! /usr/bin/env python
- import os, sys, glob
-+import SCons.Util
- 
- if not sys.platform.startswith('win'):
-   BOLD   ="\033[1m"
-@@ -156,17 +157,18 @@
-     env.__delitem__('CPPPATH')
-   if env.has_key('CPPDEFINES'):
-     env.__delitem__('CPPDEFINES')
--  if env.has_key('CXXFLAGS'):
--    env.__delitem__('CXXFLAGS')
-   if env.has_key('LIBPATH'):
-     env.__delitem__('LIBPATH')
-   if env.has_key('LIBS'):
-     env.__delitem__('LIBS')
--  if env.has_key('LINKFLAGS'):
--    env.__delitem__('LINKFLAGS')
-   if env.has_key('QT3'):
-     env.__delitem__('QT3')
- 
-+  if os.environ.has_key('CXXFLAGS'):
-+    env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+  if os.environ.has_key('LDFLAGS'):
-+    env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+
-   print BOLD + """
- --------------------------------------------------""" + NORMAL
-   print "Use MinGW compiler                : ",
-@@ -189,7 +191,6 @@
-       env.Append(CXXFLAGS   = '-g')
-   else:
-     print 'no '
--    env.Append(CXXFLAGS = '-O2' )
-     env.Append(CPPDEFINES = ['NDEBUG', 'NO_DEBUG'])
-     env['DEBUG'] = 0
- 
-@@ -309,6 +310,10 @@
-   ( 'LINKFLAGS', 'linker flags'),
-   ( 'QT3', 'use qt3')
- )
-+if os.environ.has_key('CC'):
-+  env['CC'] = os.environ['CC']
-+if os.environ.has_key('CXX'):
-+  env['CXX'] = os.environ['CXX']
- opts.Update(env)
- 
- # to avoid an error message 'how to make target configure... ?'
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch
deleted file mode 100644
index 89bf64445e76..000000000000
--- a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fix broken printf statements:
-* src/main.cpp:49:62: warning: too many arguments for format [-Wformat-extra-args]
-*    printf("Usage:\n bpmdetect [switches] [files]\n\n", version);
-*
-* src/track.cpp:111:57: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘double’ [-Wformat=]
-*      snprintf(buffer, BPM_LEN, "%05d", (int) dBPM * 100. );
-
---- bpmdetect/src/main.cpp
-+++ bpmdetect/src/main.cpp
-@@ -34,6 +34,7 @@
- #endif
- 
- #include <getopt.h>
-+#include <stdio.h>
- 
- #include "track.h"
- #include "trackfmod.h"  // for FMOD system
-@@ -46,7 +47,7 @@
- 
- void display_help() {
-   printf("BPMDetect version %s\n\n", version);
--  printf("Usage:\n bpmdetect [switches] [files]\n\n", version);
-+  fputs("Usage:\n bpmdetect [switches] [files]\n\n", stdout);
-   printf("Switches:\n");
- #ifndef NO_GUI
-   printf("-c --console         - run in console mode\n");
---- bpmdetect/src/track.cpp
-+++ bpmdetect/src/track.cpp
-@@ -108,7 +108,7 @@
-   } else if( format == "000" ) {
-     snprintf(buffer, BPM_LEN, "%03d", (int) dBPM );
-   } else if( format == "00000" ) {
--    snprintf(buffer, BPM_LEN, "%05d", (int) dBPM * 100. );
-+    snprintf(buffer, BPM_LEN, "%05d", static_cast<int>(dBPM * 100.) );
-   } else { // all other formats are converted to "0.00"
-     snprintf(buffer, BPM_LEN, "%.2f", dBPM );
-   }
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch
deleted file mode 100644
index c29961645615..000000000000
--- a/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur bpmdetect.orig/src/main.cpp bpmdetect/src/main.cpp
---- bpmdetect.orig/src/main.cpp	2008-05-01 12:50:18.000000000 +0300
-+++ bpmdetect/src/main.cpp	2009-06-03 22:24:56.000000000 +0300
-@@ -20,6 +20,8 @@
-  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-  ***************************************************************************/
- 
-+#include <cstdio>
-+
- #ifndef NO_GUI
-  #ifdef USE_QT3
-   #include "dlgbpmdetect3.h"
-diff -ur bpmdetect.orig/src/SConscript bpmdetect/src/SConscript
---- bpmdetect.orig/src/SConscript	2008-04-24 19:49:52.000000000 +0300
-+++ bpmdetect/src/SConscript	2009-06-03 22:33:57.000000000 +0300
-@@ -234,7 +234,7 @@
- 
-   env.Append(LIBS = ['id3', 'fmodex', 'z'])
-   env.Append(CPPPATH = ['.', '..', '../includes'])
--  env.Append(LIBPATH = ['.', '../libs'])
-+  env.Append(LIBPATH = ['.', '../libs', '/opt/fmodex/api/lib'])
-   env['ISCONFIGURED']=1
-   # And finally save the options in the cache
-   opts.Save(cachefile, env)
-diff -ur bpmdetect.orig/src/track.cpp bpmdetect/src/track.cpp
---- bpmdetect.orig/src/track.cpp	2008-04-25 22:33:18.000000000 +0300
-+++ bpmdetect/src/track.cpp	2009-06-03 22:26:24.000000000 +0300
-@@ -20,6 +20,8 @@
-  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-  ***************************************************************************/
- 
-+#include <cstdio>
-+
- #include "track.h"
- #include "trackfmod.h"
- #include "BPMDetect.h"
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 74ae4c9b33a6..f57739d54774 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -2,7 +2,7 @@ AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db
 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
 DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
 DIST clementine-1.3.1_p20180219.tar.gz 8486446 BLAKE2B f0d34dae90acfd41a4dad6943ea088fb64d16308caf8dce569c0c5a900c149a0c40838b8f420a42e9e5cf6718965cec8fe7f9bb2ed7489719f3d8316308f2d49 SHA512 7464f03be6894202ecfeb9f2dd97821cd76cec1285be2dc82155b023406c57ec1a94e3659438726b6bf3c667579ab43f668f03e12c261aea05aa468e73a05146
-EBUILD clementine-1.3.1_p20171113.ebuild 4950 BLAKE2B 7c0efc0ab1517acb1d9aa21e115e0907afc0c806803066544f91482a7b183820a2c5927ba0c2dbc89c9590be399edcdecbef455e1c95e51e66131377c05fc116 SHA512 04cff9e9a96eb11d3bccabc1f95fd705eaf84593de06211faeb85876ae3b4ef595afb34f97ad526d377b53a307eccb8bc9a31b90da22ecdc1271a129ccf9a9cf
-EBUILD clementine-1.3.1_p20180219.ebuild 5581 BLAKE2B b3829dd28ba74a66dfd6c45efebc1a5c8760a6c5b4d6c886d14a9ff9a385327a377b1bbaf03f06748a7e2ce9a6d09413cace3c6731787c0756d52fa6a60938e2 SHA512 b829f3736e8442b1ceb14f973e8bdc66e67cb8afa8d76436f55910c169e3bc74450428e522a47cfa37bfc0e96e8cf3bd9b43e4de865b9347c76662fd17d4b9d2
-EBUILD clementine-9999.ebuild 5551 BLAKE2B 669d11a55c9fc16754e7ce28437639ac2b957b60608f95110cb567350c55637396a8242186d15a27bc36e4c32a7db1f695cbc392c42fcaf6760865a1180f0606 SHA512 930d60dc71320e140b939080b33ef2a1d10123645e837440483aadca27a55b52b6c6761d12c1d52a6729d066e7c22d49b077ea54b3020041f84694191fac596e
+EBUILD clementine-1.3.1_p20171113.ebuild 4924 BLAKE2B 09cd8a038fccadaf0a023e1092e4c38047bc398f9d1239aa67a96fe216a0c8642719613da76171d6a9f30e49e916d943b207eb8436f69f1a4a6a623aec0a4706 SHA512 f12a7cad0d39622df4b1ef47f7a4844c97957ab802f25d43a489fbbd7d722d644c336436153f297f52d2d3397241d0002606b13a71cbd2dc52564e2d7164d453
+EBUILD clementine-1.3.1_p20180219.ebuild 5572 BLAKE2B e17a5eefb07b64db960211662ccbe2db81fbdf666f3a38e999becef3ec75eb300db3978f5e60fb48994cb0997035576520108985858aeedf563622cd0b144851 SHA512 66320677b9e59c3064a76c120e3baf13f797317a2846e3d3b76dbf93bc33e71bb7db22049bb4a47f8ca4edce4057098d1784e43b288ff68c56dabd6f48a37e18
+EBUILD clementine-9999.ebuild 5542 BLAKE2B d53c697df82d75b78745a7b3bf682a3e0062babe7656e8fb86c1dcd3bd1da96b5f004af5315eaeab134eb7c053a6e216621b668ec47449fb130547550ba1487e SHA512 c18099280c91ac11269535b9a5c0cc4dbee9895c4ff90687a25a217ff6b4461e587628667a1068cc68eb97139072be833510ab34f6e6910fc12b5c0eb84ca9e9
 MISC metadata.xml 1270 BLAKE2B 42b3ad43defebc30898db95bac41edde89d345e4776fa81f84581f8f35df8fa962024f0d08e84bfceba1080966988308434c7aac90d244ead02cc3a1fe01c58e SHA512 9d69291b66803e4dbe1ca50309891fcd9ee5ad5264bb7827a88a550367d770482744f3b5689f60a584b3fda7614cd27743085492dc72727275b470b225b96cf4
diff --git a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild
index 6abef56f6306..7210f9e8b91b 100644
--- a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild
@@ -70,10 +70,7 @@ RDEPEND="${COMMON_DEPEND}
 	udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="${COMMON_DEPEND}
-	|| (
-		>=dev-cpp/gtest-1.8.0
-		dev-cpp/gmock
-	)
+	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/media-sound/clementine/clementine-1.3.1_p20180219.ebuild b/media-sound/clementine/clementine-1.3.1_p20180219.ebuild
index 1b51036575ce..0cbf9b6da163 100644
--- a/media-sound/clementine/clementine-1.3.1_p20180219.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20180219.ebuild
@@ -80,12 +80,10 @@ RDEPEND="${COMMON_DEPEND}
 	udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="${COMMON_DEPEND}
-	|| (
-		>=dev-cpp/gtest-1.8.0
-		dev-cpp/gmock
-	)
-	dev-libs/boost:=
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
 	dev-qt/linguist-tools:5
+	dev-qt/qtopengl:5
 	sys-devel/gettext
 	virtual/pkgconfig
 	box? ( dev-cpp/sparsehash )
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 38adae3d11b3..16065b58a5a9 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -43,8 +43,6 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
 	media-libs/chromaprint:=
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
@@ -80,12 +78,12 @@ RDEPEND="${COMMON_DEPEND}
 	udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="${COMMON_DEPEND}
-	|| (
-		>=dev-cpp/gtest-1.8.0
-		dev-cpp/gmock
-	)
-	dev-libs/boost:=
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
 	dev-qt/linguist-tools:5
+	dev-qt/qtopengl:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
 	sys-devel/gettext
 	virtual/pkgconfig
 	box? ( dev-cpp/sparsehash )
diff --git a/media-sound/deinvert/Manifest b/media-sound/deinvert/Manifest
new file mode 100644
index 000000000000..ab51ff16ff5b
--- /dev/null
+++ b/media-sound/deinvert/Manifest
@@ -0,0 +1,2 @@
+EBUILD deinvert-9999.ebuild 577 BLAKE2B 73d11db67d8e80b4505d7c5e30d16aa94d0980dc8c029399c1970cb7ce3dbc1df5269323afc192ca2d5199a5c9c71ac7713506ff86e7601480a10d9649b96a50 SHA512 43c85e567aedac7f8d8184d70a87403c4a1385536e60fabb23632c13789a177588fd4a525062da4111a9602f0e01e61ac78d173438ffb4137b5a1d3b95018dd0
+MISC metadata.xml 423 BLAKE2B e479098ed0b83916450f63d88e3cd5f899de281847188b3068cc98cbf5b5a2b3aa5d762b6453cb8063de268ec8fe24a92e96b8debbb24289f2d847cbefbe6a59 SHA512 e464f850132dc3fbc1aa1d5c067e061edb7dc6e1dc8b4ccec22aeff906d9934cc42bc8bb9ce5b79c6a2f7fd0eb45d973f85c4ee9340fdd8e41244d8ecb006265
diff --git a/media-sound/deinvert/deinvert-9999.ebuild b/media-sound/deinvert/deinvert-9999.ebuild
new file mode 100644
index 000000000000..8f9dfb0b0b80
--- /dev/null
+++ b/media-sound/deinvert/deinvert-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit git-r3 autotools
+
+DESCRIPTION="A voice inversion descrambler"
+HOMEPAGE="https://github.com/windytan/deinvert"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/windytan/deinvert.git"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="+liquid +wav"
+
+DEPEND="liquid? ( net-libs/liquid-dsp )
+		wav? ( media-libs/libsndfile )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with liquid) \
+		$(use_with wav sndfile)
+}
diff --git a/media-sound/deinvert/metadata.xml b/media-sound/deinvert/metadata.xml
new file mode 100644
index 000000000000..a075d9becd13
--- /dev/null
+++ b/media-sound/deinvert/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<use>
+		<flag name="liquid">improve sound quality using <pkg>net-libs/liquid-dsp</pkg></flag>
+		<flag name="wav">wav file support using <pkg>media-libs/libsndfile</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/gramofile/Manifest b/media-sound/gramofile/Manifest
index f10640a62240..290cee8e52ea 100644
--- a/media-sound/gramofile/Manifest
+++ b/media-sound/gramofile/Manifest
@@ -5,5 +5,5 @@ DIST gramofile_1.6-8.diff.gz 26697 BLAKE2B 67b620351d87b297d9a7f62e85f5159993e78
 DIST gramofile_1.6-9.diff.gz 25244 BLAKE2B 60170f960693932d894022d0c576b2d58764e546e6f2a13461ab78abfb92235007047bb9f35964859908c580c815d21e8c80d73ddd4e33b0c1d25deda78d395a SHA512 2c3b0131afcbae680432e5fc1bb753bae7c19d5bb4372808a0f86ef704800aea218e3bfe625bffe46ee3cd4a38f89a488141223d22b8f467cab45ee4a962c249
 DIST gramofile_1.6.orig.tar.gz 108596 BLAKE2B fc076c60d3f2f46ab33f63194db165b6d0df6bd76996bade730968dfd821d234b0a88f486e98f84e76804efb8b08fb2538cb553de5f9eb09eb3dde60b441fbf4 SHA512 171a7cff4066d625b9263f5462bf3e8fba30a02b629f20f7b38031cf037eb0940cfb54b73671d10948ac3326e272b3576de785310022007e0d4dca4f164815a5
 EBUILD gramofile-1.6-r1.ebuild 1023 BLAKE2B ec2d7daf44a878813c3db5f70db4f924d3af0bf9503f84f581cba1cec1f9b2d71650bef9be5318513ef4134686775d86d7195e9c8a58699a8be34789462fbca3 SHA512 bbce995fc183f5ad06fc4f3eddd8cb494f0b4af852124cba710d118ece440062fa9b685c4aa1299202165397619b149213d079c0d0f6b916c0b8858842cbe178
-EBUILD gramofile-1.6_p9.ebuild 1032 BLAKE2B b0ed10571699a61e5c7b62c11d2a9e4c38dcde8bc0a2a45d6203ce7f7d0769073a0b44e76f6340883e46c19318d289be963ae3d6b7f4f45609ee9d0174390dd8 SHA512 434acf8bb4d7c6dd0b657a2842ee14ffcaa42fa6b4f8a02d4128136899caa573290c444f4ea4617e835222f2f1bd596be611c8f8aeb5ba3122272a28e4637d54
+EBUILD gramofile-1.6_p9.ebuild 1031 BLAKE2B 51688b714ce029740099cab62914bf3eef9c6ce19b2f81758a64b1dcd26440362cea106cdf7f2dceb7f070fa7a9f3f65797517e761b0ba2b03d57103863154e3 SHA512 a6f9c1f906744257eab916dd463d53f8c1da074ce2f10ca7112f5ecd1c2aada55bfe02006c7ec2e7faac0de4ca9f7390e4b3050a7a0913a95abab036cec57482
 MISC metadata.xml 871 BLAKE2B 19a80d0e429503c3b745ec38782480b79631e083c51e676e831ffebcf38ad342013e3cafec545dbe05f830e1267db85634f5c6c83fb6188fe1666e4a9d7d97c9 SHA512 12ff2b2a524bb2e9b3d54c4a1cb4f1739f4ff5a664a01074a1759cf34593e110ddd80f5128a2d2ed222e20f80e329cd3af231ec726665c23bc36cd25cd384b22
diff --git a/media-sound/gramofile/gramofile-1.6_p9.ebuild b/media-sound/gramofile/gramofile-1.6_p9.ebuild
index 1ed1c4b6e0f8..d05d50cec097 100644
--- a/media-sound/gramofile/gramofile-1.6_p9.ebuild
+++ b/media-sound/gramofile/gramofile-1.6_p9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
 	sys-libs/ncurses
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 209ef340c5ac..f98f19b86659 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -2,7 +2,7 @@ DIST grip-3.4.3.tar.gz 740870 BLAKE2B d6b703d4ba08bf976a53e70772977a6b0fd5cd231f
 DIST grip-3.5.2.tar.gz 952153 BLAKE2B e82ccb50636e68ab9862d2004a4dbe59399372b76a835b33350e539a186fed516e7b4961fe930b3beb5168554324a5bebeee5ef03d1cb7731d7f9d7c1fd1feb9 SHA512 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421
 DIST grip-3.6.2.tar.gz 959393 BLAKE2B 09f7c6bbd5e82ada26795f082feb0d35cd21e14bac0e5881502c65d1e64f501eb086d5843b5120408186435ce6a95771bcf94972881fc449d4c4c2130f929066 SHA512 8aba6dbf4cb374dbe76fb5358f4b550187840a1248f9a60d8441a123ad5abe49d6fe4bcd491047d19432dd90a6dbd9060737f9e2ba19fa60e5e4c50ec5fd8cf8
 DIST grip-3.6.3.tar.gz 960255 BLAKE2B 9aad33c04e98f60e5f7871e36f2e4bf616a16486482e7363d165ae7d9fc5343a52583e490b9b9757d31b051e6e96165d35931370e2681d727db7abb0854db2d5 SHA512 f94c5dc24a1355a024833992d05a7c05d84367a004607c9d6c7aa6d4bc24dd93b11e0a061689eb521a8abe637472011a1a4c8e968c48ac8447457cffc4d2957d
-EBUILD grip-3.4.3.ebuild 1208 BLAKE2B 02a70b62576c3c42717e1492e3f2592a5e694722c4f527f5a34c39868df1b5307f812905d7c8d7e072cad9a0a2fa1138a198fde7e872394010dbac5d7ed8381f SHA512 7d9b2282e8c4ff9570fe382c2e8e99ae81505007a2da45379fc83682dcec1324efaf34d695effac0486563dad46a3e7cee8e007f2361e9c480a74e8d9fb6b88e
+EBUILD grip-3.4.3.ebuild 1207 BLAKE2B 014b3ae549e72ae4960820532e746337a3d821684f98e19619ab9314441c2be743df3e7049885c921bd5d09f837d275a661116a9c258cfce1008f7978a5fcb00 SHA512 e6fff5d8728217b346a200ee84bec062212be2a2b37e5e942f730d897e53983df66e032a72e7540be6aa83732cd9bd0bdf20566b66ebf6a37a21f1e909a6f44c
 EBUILD grip-3.5.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
 EBUILD grip-3.6.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
 EBUILD grip-3.6.3.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
diff --git a/media-sound/grip/grip-3.4.3.ebuild b/media-sound/grip/grip-3.4.3.ebuild
index 42a84e6794cf..7eb40385061a 100644
--- a/media-sound/grip/grip-3.4.3.ebuild
+++ b/media-sound/grip/grip-3.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
index 227bd0d26963..40387ec3ddfe 100644
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -2,6 +2,6 @@ AUX herrie-2.2-fix-buildsystem.patch 1183 BLAKE2B fc3752e625b75d50f0aa3c72bcf738
 AUX herrie-2.2-libxspf.patch 3025 BLAKE2B 22deefb9b02e26b184e5801ac9543a66e4cf4e140368ec34bfa2bee36c99d72899abfac7c62489f3b2efeb121ec478734952054e9626fbe11644050c37ff30e2 SHA512 35122f8a0f16c54085d0c4ce8f1acf409266618116bbb94a8cae2b35c8856270a023d16d3c863ed3c1d06ea1f89a8f1d3d29e244881fb50bfed72b5ca1960192
 AUX herrie-chost_issue.patch 547 BLAKE2B 2310336da0c3e9af7f7758cfe33293694d5a5c0efbf03a3eae4010c2a3ff1e3d62107e001bdb012a166ae84fe9cb9ab3f08b59d3c737e2bca03e3e2d9a53d5e2 SHA512 09b0720ab8f94fef7533d7e16d2ef086aaad3d306487bca6e2f42d0fba96642ad9672f67183bd58542c3af06af643421be66e3c0afff43f023239d4602c13150
 DIST herrie-2.2.tar.bz2 71596 BLAKE2B 7065711dea83c1ff3bb2ede9b155f032f463dc8f51657adcfc1b46076a241cd9bcb62a80284de93b076b3ab9419a4cac01a9edbb8f76f1b07565b20c93e2c3a8 SHA512 7f89100f1c3376d03ebc5e5e3caadccb063470ab623c7b207e9e6aaa01d7e1885d4234e3a50675bc1ade07f5ab52a34022f4e18c9a5b4f9537baa7318f4ab213
-EBUILD herrie-2.2-r1.ebuild 1835 BLAKE2B 36d03409609d6ebb279c1b133aca3bd459db6749485b5d2b2198507a609c0e7acfae0689f766e94c78e3b919a54135395fc369004b90f34bbfbf87166e7f148e SHA512 c76d399afa2085b9fbb73b6b50a8d3cdd453c7fc34c6207fe59bff6612cdf6543a25528e798cc0a555e5fdc405e8dffd268aa932b272861b806a01480091eee7
+EBUILD herrie-2.2-r1.ebuild 1834 BLAKE2B e025e42582e169a821a163c799405bb797c365e0d8d98a334d52f0397f720e5c3fbcb7869c6f92d2949850b9b832fc854fe64a331c0bb8fe6684d3db749a0804 SHA512 54fdcde336dfe8e14ad31e0c10e3d1f6232475170147bb7fc56e2072f7dcf3cb628f65115fe69a1fb7aeca61a3e0c1683fbb9a7c8c5b52cacc409656478195a2
 EBUILD herrie-2.2.ebuild 2082 BLAKE2B 3c0b90662572380ba58e3e2b86960b7fd60d5fc46e263f47f673fec0c7bf8fb9202ef9f5850380e5f2a0829d9ec67689efa738ca97512df39cbde55fe0e1b0d6 SHA512 53fb61e64bc52f0d5cb414d5aa8c97980ea1cdaf1fcaaa0e8254f795787744028e99280e2cf938482904efbc4c9f2a27adbbc78a331526af0c467d9e18b2081d
 MISC metadata.xml 1055 BLAKE2B fe6982ef85121180c38c9beaa2699940a56dc68f996d1a49c56ad7d16401b3dd2e23a6101357e577b5f271e8313390a979aabe79c9b8e591543dd81ef3fffd39 SHA512 0a987472d87f237e821363b4c6b4cdafce6a5ce43d31a30f09e7f8e9499a9b7b013a02e2d31cbf61be62ff845dec0c21f6b13f7c64ecf2a72666008450ee7dc3
diff --git a/media-sound/herrie/herrie-2.2-r1.ebuild b/media-sound/herrie/herrie-2.2-r1.ebuild
index 38f92a684ac0..ac128f74c5da 100644
--- a/media-sound/herrie/herrie-2.2-r1.ebuild
+++ b/media-sound/herrie/herrie-2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="ao +alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
 REQUIRED_USE="|| ( ao alsa pulseaudio oss )"
 
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index d2a097bd1367..b5f5bbef899b 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,8 +1,10 @@
 AUX hydrogen-0.9.5-gcc47.patch 761 BLAKE2B 4dcf893c24a6cd8f3669af7f1b5517488adfd6aaf5018959732225f46ce0013faea98554a2e370c0d724100f64cd92308e00bf619271e9de4125dc7b7971f1fe SHA512 ff3a06fbafdce19bf04f9fb71c04ff754e22caa36148a0f5e4a56efc53ce9b9478e9f1aeacdcc037234104762d9fce208aef351c70941b044e2d83bac4131304
 AUX hydrogen-0.9.5-gcc6.patch 609 BLAKE2B f34496e0c3c251f135262ff30efaff243ae4fc0a279ad529f0bceb1e6b854b6b8b513a2f2b1c6e15ce1f68d51032817147ae7a357205345bf64876b5f2c7096b SHA512 0078c02e9cb2de557825cd6119ccfb6247f171ccc4a53ea93241891850c82f0924e9e0a4740764d13f1deefcb5e9469137e5d4a69c2bfceedeae8fb110deea8f
 AUX hydrogen-0.9.5-use_lrdf_pkgconfig.patch 858 BLAKE2B c43e9a0de36e1eee2c184b6405b3a01284dea8f058ba77aa415e85ee5e4e2bc27b975ee5a1d959471c64154f9be6cc0fe51e66db31abd7149e0350f91e8a9735 SHA512 251a74287370f66df9eeecd3b6c7963c2614cf6b17a56fc71dc9f99077c3267a2e79469e2993ae22d017ea7f6cc7c581455c97c125e3be73860321112a67fd31
-AUX hydrogen-gnuinstalldirs.patch 4979 BLAKE2B 02b3894ec8d6893c061a1a7767e44b6d5d0df3fa29fceb731e56dd83be74784195d0da13447c82326638ce7091c26c846d42c70ca6d66ef1a64310de8eab73a3 SHA512 23838dbab56d29f53ff78055f371ce11a57f7cf738c76ce22b684b1de72cefe71767a1237246c24b90034e72a72a16d4999365959563a71906e34b7da6abb3c1
+AUX hydrogen-gnuinstalldirs.patch 4495 BLAKE2B a76126880cdd1c3fe9b1715f61b819e763bd817632056db483e07c3f3c30e9c3bb2b23ee06667fee7fc7de816b788e324df05982df949d881408ba541decab3b SHA512 22f5add8c025a6c284b79b3a8eeb0dc0ea19a525abc761d808a5f966f9bb8ea250db850b649b9a5a61bd1ff794fcff0593211f51ef2b14ee9c15a20042bff8e5
 DIST hydrogen-0.9.5.tar.gz 5239702 BLAKE2B 5fb1e7561b65587a6a4b8e642a4e0262cf8521a6847f04e57d4f99af2ef38fecb05f779cd5b0c25d487360db6455b0912729e7deac0d9959e8c32938a44b1adb SHA512 0053f0cb301c541326b66eb416dc548561a973ade993c055e7bc2acbdf28732e627a605061c8b487644026510f5b8395946bba209ddfd19230c960e9bb619f97
+DIST hydrogen-1.0.0_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47
 EBUILD hydrogen-0.9.5-r1.ebuild 1816 BLAKE2B b66901bef46726ad957b37074ec247d7c9d502f324c8a0a2da2bca3af036a204b6f63fb0047672ef6fa38194c263c210efae02ae33d8eb56a4169bbf4a8529cf SHA512 0bd6ded8debf0915399c1dcc56537730d3c8a8b219262223d567f2240f3019de5675196102da55840c039ab30814ef27ec1f7b1c4313e537e07970e353956b86
+EBUILD hydrogen-1.0.0_pre20180301.ebuild 1926 BLAKE2B b88f489f1bf0fb1f5ef1ab85b46f1d6b5c094815e946c85b707f0742fddb625e6c041b6a1a9980c196522a0f598c6df0270ec5aece81cc80821e76d036ffbd2d SHA512 72b2d488254bf015967c2baacb2bbb99199452357f30a2f10cb8ae306c3d71a59d44eb363857874b279cbc25f17a2d3929e7e07e4effda0710696afb39881e8f
 EBUILD hydrogen-9999.ebuild 1831 BLAKE2B b05a1bb7a184ccf69846132a79a82c4677b77ac8e6b51bb8114734bc1ac47e19c7d4a9deb3b3ca14237f17d360a702253b8318ffe4bda7d1811ac572b79b9c63 SHA512 26532173d65743e0b102e2169a32bc1e39464e51bcdc4185080be069e49b66a5eb224a31510e79e4f118e09e617754e26d2da85123d1a79967888bae113bc9ca
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
index d42b3971d45b..e0100eedf7cc 100644
--- a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
+++ b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
@@ -25,19 +25,12 @@ index 96dbf47a..2caab298 100644
  SET(LIBSNDFILE_VERSION_PREV "1.0.17")
  
  #
-@@ -146,13 +148,13 @@ ELSE(MINGW)
- 		#Without setting this, installation would go into /usr/local, which does not exist per default
- 		SET(CMAKE_INSTALL_PREFIX "/usr" )
-     ELSE(APPLE)
--        SET(OSS_LIB_PATHS "/usr/lib${LIB_SUFFIX}/oss/lib" "/usr/local/lib${LIB_SUFFIX}/oss/lib" )
-+        SET(OSS_LIB_PATHS "${CMAKE_INSTALL_LIBDIR}/oss/lib" "/usr/local/lib${LIB_SUFFIX}/oss/lib" )
-     ENDIF(APPLE)
- ENDIF(MINGW)
+@@ -150,7 +152,7 @@ ELSE(MINGW)
  
  #Installation paths
  # TODO remove data from path
 -SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data")
-+SET(SYS_DATA_PATH "${CMAKE_INSTALL_DATAROOTDIR}/hydrogen/data")
++SET(SYS_DATA_PATH "${CMAKE_FULL_INSTALL_DATAROOTDIR}/hydrogen/data")
  # TODO remove data from path, could be .config/hydrogen
  SET(USR_DATA_PATH ".hydrogen/data")
  
@@ -49,15 +42,14 @@ index 96dbf47a..2caab298 100644
 -	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
 -	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "/usr/share/pixmaps")
 -	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pixmaps")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/appdata")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/applications")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_FULL_INSTALL_DATAROOTDIR}/pixmaps")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_FULL_INSTALL_MANDIR}/man1")
  ENDIF()
  
  #
 diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
-index f6cd04eb..7725dc83 100644
 --- a/src/cli/CMakeLists.txt
 +++ b/src/cli/CMakeLists.txt
 @@ -20,4 +20,4 @@ TARGET_LINK_LIBRARIES(h2cli
@@ -67,7 +59,6 @@ index f6cd04eb..7725dc83 100644
 -INSTALL(TARGETS h2cli RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
 +INSTALL(TARGETS h2cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
 diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index db1333da..0ab61d96 100644
 --- a/src/core/CMakeLists.txt
 +++ b/src/core/CMakeLists.txt
 @@ -57,13 +57,13 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION}
@@ -85,10 +76,9 @@ index db1333da..0ab61d96 100644
  IF(NOT APPLE AND NOT WIN32)
      INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
 -    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/hydrogen" )
-+    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
++    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_FULL_INSTALL_INCLUDEDIR}/hydrogen" )
  ENDIF()
 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index fb375e48..9cd18e6a 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
 @@ -57,4 +57,4 @@ TARGET_LINK_LIBRARIES(hydrogen
@@ -98,7 +88,6 @@ index fb375e48..9cd18e6a 100644
 -INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
 +INSTALL(TARGETS hydrogen RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
 diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt
-index 72c270f3..836fc5b4 100644
 --- a/src/player/CMakeLists.txt
 +++ b/src/player/CMakeLists.txt
 @@ -16,4 +16,4 @@ TARGET_LINK_LIBRARIES(h2player
diff --git a/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild
new file mode 100644
index 000000000000..4033354017a8
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.0.0_pre20180301.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=1a477ffe380f153c5d9fb3495d9874df7f75334f
+inherit cmake-utils git-r3 vcs-snapshot xdg-utils
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org/"
+SRC_URI="https://github.com/${PN}-music/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 ZLIB"
+SLOT="0"
+KEYWORDS=""
+IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
+
+REQUIRED_USE="lash? ( alsa )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/libsndfile-1.0.18
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lash? ( media-sound/lash )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
+
+PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_CPPUNIT=OFF
+		-DWANT_DEBUG=OFF
+		-DWANT_JACK=$(usex jack)
+		-DWANT_JACKSESSION=$(usex jack)
+		-DWANT_LADSPA=$(usex ladspa)
+		-DWANT_LASH=$(usex lash)
+		-DWANT_LIBARCHIVE=$(usex archive)
+		-DWANT_LRDF=$(usex ladspa)
+		-DWANT_OSC=$(usex osc)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PORTMIDI=$(usex portmidi)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_RUBBERBAND=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dosym ../../${PN}/data/doc /usr/share/doc/${PF}/html
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/jaaa/Manifest b/media-sound/jaaa/Manifest
index 1bd3801abb63..beba4c391b1e 100644
--- a/media-sound/jaaa/Manifest
+++ b/media-sound/jaaa/Manifest
@@ -6,5 +6,5 @@ DIST jaaa-0.6.0.tar.bz2 25375 BLAKE2B 773183f25846a6a56a55c0fc2e9d72bd6bc4bea2e5
 DIST jaaa-0.8.4.tar.bz2 25282 BLAKE2B b42d5f21fcdcc522724bb609e4e0d2c151a23d10368d7db1ba7b4d34fb648b924a623ed1d21501733af236be1b73a819d2b4cdfe6075047e6f709b4ecdfa6416 SHA512 d83dad995d4d6919e719671e19610be9cc6b9c14d922eabc6892f3427584baaacc212b37f0466373a38f1fcc65838851c09bb2ae72d9dfdc9c52921b594cbe8d
 EBUILD jaaa-0.4.2.ebuild 828 BLAKE2B 09d40349e6be32a57dd6f8a4cb04df27d2a35e8946243465776da8e2c1faa5a5a964c882a6a64eb9fdb66b37bd4bc2127c25db4885e1c7d871a717b1f16e3866 SHA512 8bf0eea950e5a1bd775c6ab36045217e5180452fe90c76f6d7e13213b90a842c677feb1d3f29b7682234d7589cb785fd822bd4dd4f72cead99fbb34ce6e74ba0
 EBUILD jaaa-0.6.0.ebuild 853 BLAKE2B f2d5402d07be9d730918375827c69354a36ae79ae812c3724a054dcbadaa3411f8b40bbf8c2a97268e4c4024c2559d479636c60838c23ec6d6edaacf90546e43 SHA512 5ee1a764c3599480d826e475daec4700355ac331cc8e5d540b8efc90118e6abc2348a9d320430599e3ae463f27ccba651e8591a52db9ec3bf9405a1aad63ca55
-EBUILD jaaa-0.8.4.ebuild 893 BLAKE2B 3345bd56a15f179c010075488180cfc7ac16a93a789ea3cbbd0a37f71890c6f794f659ad3c0201ad5c689d8bf11ba3b7ac5984c4ba2b71b6794fdf66dfa8868b SHA512 d653666f3773f276ac14fff5c90e1414a6468cc767afe89b0f2ccbdf1e65daa031fe78fbbfa6bd55c0b072cbfc6b3e304b1051ebd66b3ee0d542fc8527248329
+EBUILD jaaa-0.8.4.ebuild 892 BLAKE2B a07b2ae80caa8f6042d63f698f4633158889e46348970938f98c143840c458b1f970716c032c9004f7ea349871fc45e6abc3e212a5d231ec6333c8abdb49f8bb SHA512 7c3fcf3e17d82c6a8aa6334a085195f5ad86dc3ad8f9dad7cd0fc77e42275745455f0f35dd51336303b2346fe4ea17dcce3e64c546978868673124b7fc257911
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/jaaa/jaaa-0.8.4.ebuild b/media-sound/jaaa/jaaa-0.8.4.ebuild
index ae8bc0452914..adabb85a3275 100644
--- a/media-sound/jaaa/jaaa-0.8.4.ebuild
+++ b/media-sound/jaaa/jaaa-0.8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="media-libs/zita-alsa-pcmi
diff --git a/media-sound/jamin/Manifest b/media-sound/jamin/Manifest
index 9c6e5ac826f9..87632f246f73 100644
--- a/media-sound/jamin/Manifest
+++ b/media-sound/jamin/Manifest
@@ -2,5 +2,5 @@ AUX jamin-0.95.0-desktop.patch 308 BLAKE2B 0c7a0dcdc4d58229fc1d15d50bcbbe53721ae
 AUX jamin-0.95.0-multilib-strict.patch 335 BLAKE2B c6cd90004e8ee7ec6191dd251d41ffb462e500dba5774c82dfb71b8e77455fd5f96008b5a8bfc094c138223afb734dd2bed00033d93d88eacc5b5ba342de6918 SHA512 14adfe893d4ea18efbb3a936df34f163689a0cf734ca391d80558d92c4ef82cb944f94d962ecba25fc358e2756b252302ac648d789a850fab608216588d5ed03
 DIST jamin-0.95.0.tar.gz 1007290 BLAKE2B 52e28f05170880307a5e50424fce3511ece30ea9e36e479c38efbbfe80c8c6a4116742c42e74a5ded717ad6d3f6b5c780e6b79c764ad280cba3538678b223866 SHA512 c57079b65e89623ee6b3f1e71d4ce1c2d995e4a14f8decd17b5d936e99469bb85089da063358e966fdc19a6fa419698c9ca586909d85d69b0525e929a3bd2555
 EBUILD jamin-0.95.0-r2.ebuild 889 BLAKE2B 24324e0ac38f13f525db82ca799e97fa8eb263b08c4424ca70e7f51373f179d6cf364bd8a6b2cc314cbaf6626bb4cecd1292f8c58f31451eabae224a6b1c2a82 SHA512 acebc8735d41e94771917b271236e88e2eca5d0dedaafa2ac42952e4c1754cdedb66c6945bf2dc04c61f2f4922cf07cb8b801ec9dacd9710a2d10c909e0b503d
-EBUILD jamin-0.95.0-r3.ebuild 888 BLAKE2B c21e514ba59a17807f8968bc9a795182c7bf4154385707af8a16c80d2b2017194d13b460eb2cf5e65223551133bbd74ce1b22ed9f7eb05d2480d264689a5e397 SHA512 028804c0242b00576c4f587cc3e00114998418be51993c4f84058cc0c737e5fdb95b295c9f2bc6d3a1a1ecbd7bd5677a8dff9f0881a4454a4189de6314381326
+EBUILD jamin-0.95.0-r3.ebuild 887 BLAKE2B 35e2f6fb54b38902266f1208bb2829ff1c8833a270ab320899793a5d9d9b4d9d997c8d0a982ca0d3e823b2ccf5a6bf30b1378abbbdd32111d7bab38ea6454054 SHA512 3b97e33487f30521ef791df48e8035582aaec49179f0699feda3a944f64ff4b647e2687010eb66579dc39d2300bce58dea87fdd0dbf89b67f1ab0ccd5edc98ba
 MISC metadata.xml 334 BLAKE2B 49b789d957dd730e2d74f25297b90b83357f29cb2ef4c9b8820a39841c334c566bf82752a1ab1d53d7925d9fad8fd1243f00bfbe0bb71ee5edd0999aff303a71 SHA512 4b263c4fc008cbc6e415426fa782c934c55ad5d5f7d7d257ca79e414234cc5284c0edc938d138dcadb670bfbe35857a6103ac0b990f099e694c69e7ae349656a
diff --git a/media-sound/jamin/jamin-0.95.0-r3.ebuild b/media-sound/jamin/jamin-0.95.0-r3.ebuild
index ae0c1b7777d7..4cbda8f70780 100644
--- a/media-sound/jamin/jamin-0.95.0-r3.ebuild
+++ b/media-sound/jamin/jamin-0.95.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="osc"
 
 RDEPEND="
diff --git a/media-sound/mpfc/Manifest b/media-sound/mpfc/Manifest
index 84e75e60be2a..def659fcbd0b 100644
--- a/media-sound/mpfc/Manifest
+++ b/media-sound/mpfc/Manifest
@@ -8,5 +8,5 @@ AUX mpfc-gcc4.patch 475 BLAKE2B b45c0c674cca9d8cc78fb3e5e0926f35eb1e2f88daf2780d
 DIST mpfc-1.3.7.tar.gz 869364 BLAKE2B 4ce61a80efad417c138b51ae1b994a2db64ed0ed07e5d0af47d69569edb1f2f8fed6a653ac18ef5c10bf2cdc83f21ded71947614c43fe9a79efeee5c9f27da81 SHA512 bef536c639a4d2422d0e04ca9aa6c18cee28e4936349ec796a4a25dd069fe0a7996c0d32b18b29b25f5acfa11e4fd4fe78becfe447d6726574bc320041fdf3d6
 DIST mpfc-1.3.8.1.tar.gz 1042027 BLAKE2B 2d0e1991397930d8251db4c766705b769e24adf518d963bc56bba92f3aaf9deeedca2331e6fbeab609d4fd0dc49a69a35f3180149b7f35c0d94795e6be22ff59 SHA512 071e12ea784a8610aa6621f5afa1c6ba1e2a3ffe0deac8175b8b43b4446f0c54ff049fd8321aff7551766fe4561a974e39bbf93e30b353b25e27673ea9584573
 EBUILD mpfc-1.3.7-r1.ebuild 1218 BLAKE2B 1baf1abcf29ef1bb549bae11e9142b45d94472b3537bbc728c3bfbd5f0dfcfebb43a5805be8f5de9e334e71048cc82602e4bea9751933cbe05058112cfb588f3 SHA512 ccb9d1ea5dd52c4579a21f5a427ee3179a49d93a318982409a2c081f734976c76111b2600c87896ab0b42f1adc3e8d1e734d134f1aa959cce4acec9dc9bc48fa
-EBUILD mpfc-1.3.8.1-r2.ebuild 1139 BLAKE2B 82559b8787ea848578f53bfa9c59898f0faa59aedd6d47d34bc39f680e6dfbb22bcab269f80de8c8d57972a94d63540e7743156bf45250db06518cf52f043a6b SHA512 fb0ac917518d6bda5a7b6bc4ab3e96a82bb0540ce2b402b1b75f48f91832d9a24f36e3f9146ae05602197e4d88a2e493374c68516e2d2c6a476e27df89fb800d
+EBUILD mpfc-1.3.8.1-r2.ebuild 1137 BLAKE2B 2927f31392c5f6c32cc9f9636f0c1db5bd74f2fb014e8e05abf2ec25e39637a0e626652b364a212099e24f94b11249996196439211fb16e502eac177bc4b5a15 SHA512 3be5513f85958b9911102319c742659ec0acc0ecc694827b3c78fd7a61a5f704eed693a2460cbb8bff53dc4ef896c053e5128aec587f52b4126f67aec55b1c6b
 MISC metadata.xml 413 BLAKE2B 5ce36b2246ccdaa78683c2964ffb56a1f88956ef6bba4d5582840febeae3d55612a2ec1291b43d6016983763daf23aa7ae325b0a923080a469e520b258d74a1b SHA512 fd972a9e503642f833b6c08bfc662bec020bb9e88959e433e6c20ef582c2b05edd248d2b652cf2b884097fae888ab29413b41efa731399cffb261a10e6435b3a
diff --git a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
index 45a4bd4c4cbb..1c9f36d00895 100644
--- a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
+++ b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa cdda flac gpm mad nls oss static-libs vorbis wav"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
diff --git a/media-sound/orpheus/Manifest b/media-sound/orpheus/Manifest
index b6565be92fde..617237ac2997 100644
--- a/media-sound/orpheus/Manifest
+++ b/media-sound/orpheus/Manifest
@@ -8,5 +8,5 @@ AUX orpheus-1.6-gcc47.patch 275 BLAKE2B 90f817ffe97c0f32865ed2b87a9ec7a044045fe4
 AUX orpheus-1.6-nolibghttp.patch 731 BLAKE2B 032963a0a2b4e3a64f3391eb32f2771c89bb7d9591eb94d850ee0059afb9c3f987823ff66ad1a0ea3d5da71bb90127af025e997a45fc1871355f644a68e45067 SHA512 0757f7451fe0ce1d84e4ed710537daac09fff4ffbc14b9fa397cc00bf0c04ed8ad27785917d327ccd69efac10840b534f6379b2f3b020b9d1713fd801e13806b
 DIST orpheus-1.6.tar.gz 440553 BLAKE2B de5621aaf6962668bceebb35a95df7ab543b517cfe208346cdccab4f73f458611b65e4fef515c4f284d2fa83e8fc24aa77e8e6e1808fab489d056f10de7f7a99 SHA512 40f4ac7533449940370f29d4a14281d7f235ce711166e0e979f3e2a5ca37f792dc74b5267ee2a4f51af6c20f346c543d0d9f1fc88f47670971ad32f7c2856abb
 EBUILD orpheus-1.6-r2.ebuild 1226 BLAKE2B 675ce14a9c20397e7db1447baa3271b635165b8ee9a0fff7e605d7637737f2f4ff4be0b5a8944fc5ceb5f023334cdad2ee9df01136428547e43094ac9caf0f73 SHA512 d3d66b7086d5dc1d6852e36a36dbaba0e6ee021a81d714a302e8100d16d0b853bc2b9820f69215f85b9b726d2f38b277c6a387c26e4d45b73967fe0d7a508a42
-EBUILD orpheus-1.6-r3.ebuild 983 BLAKE2B 1194bd7a07ba41e1670df1d4a6a4b5eec44b54c8f512dd6d5ea52c5ea8a4035a19060b40fdd4271a36dc8b8cbb689962f7f63e8d41f50dd966d6a62d8fd40df4 SHA512 9088b4501fd74539fd9fe226e59476c2d08356e682b1672db1d4dc2437d406ee9d6c347174c7ad0e3b7890aab24002d6717216ce490f0b52bf0e1e19f8e10dc2
+EBUILD orpheus-1.6-r3.ebuild 981 BLAKE2B 2294c1ad4f7e5cd8e14096b6448b8bcbcff6799c74dbbe77c41b5b30d011d8c6b1bbb6c11aec558ced3c401994758b24fad3743cd0ba1558fc71d162b86834df SHA512 a88c4f1fbab4be4c78a390e949ab1ec22a20104c2a3436e448b41c7c1eae64f7c4ea166b7871717733fa9b3440a64b09552d84ea8b96ee968de23f1dddb02176
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/orpheus/orpheus-1.6-r3.ebuild b/media-sound/orpheus/orpheus-1.6-r3.ebuild
index 774baecbecde..d56b810a1026 100644
--- a/media-sound/orpheus/orpheus-1.6-r3.ebuild
+++ b/media-sound/orpheus/orpheus-1.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://konst.org.ua/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 90673eae0f0c..9559e24b825e 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,6 @@
 DIST picard-1.4.2.tar.gz 2116021 BLAKE2B 9629d312df20a8c69b383b424724ef4cf9f774ae70b9e11b1c6c7f96cafea575657875642af70a73633ca79eb8c79237ada16dd5ff7c021d4bdb4a0df7890de3 SHA512 5e4a6a8cfadd86b7015ab77da1969acec26e0ed92564c6634afeee5060d33d34e8fc83015880e6c8f17df66c8d15b86a85031dbe5b596c995579fb449cf8a74e
+DIST picard-2.0.0_beta1.tar.gz 2661429 BLAKE2B ebffb2651e778c2cec8a4e41307d99c30038f36096b343489d7384b1cb4ac9a3492f23a4c69ec8a0be59306efc5cf4c9098a114445be6965ed243156dcee2803 SHA512 e2fc5dadf3e469df4ed16b1827909a60a54e7dc047e1ecd80480d9283a5795e3e792b31970eb6834590ba2ea12378ec18ef404b47237c38299350ee1d9acec9d
 EBUILD picard-1.4.2.ebuild 1580 BLAKE2B 6eb8fdc3564238a16750c5d3d4872430bfc57d8fdda0901549fc6d9ffb77451d888995abe3690c8fac65da465181bbbeadd1b2988680ee4b062cdef9611cb9b2 SHA512 4026302891e66e1bec8c76d99559f88a336454beab29a22c09e355d32378b0f7d648fb33c50a209ec5da6f696aef2195795e70ba4339f71a8e44cbbe0e80fc3f
+EBUILD picard-2.0.0_beta1.ebuild 1804 BLAKE2B d9a5c1a5b39a1185dcd78a824b8e5eed5e3e302dadff43c5688757c30ff8ac19357d85866f8cba0330a504e08a8d0ae8378f727ff778d01f7b8439f30f16bafd SHA512 650fbf6458e6a3c51bd06f30f87fd51dcd4618189fb1c23ece30910f2432ab7ea7a9094c603d8d97430fdadd35d4f900098edab347b33eaf107bca6ace37ef11
 EBUILD picard-9999.ebuild 1633 BLAKE2B 8452d681019ae06f61be3257d120acc36b3d999d03e2f58b97a082deb9c55545d9768ae5b2a5376978d9a65b0355df4132c92242c4f75a7228ef71d8ee3428fa SHA512 4fe7b209a51dbb3a6940367cf5868174034cdb603c382f3efaf3ea6ce1f07f14840e3dc16e9ac4ec3b9c25373dd32d56cd4516387d3feb935dfa1cf2bce26cbd
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-2.0.0_beta1.ebuild b/media-sound/picard/picard-2.0.0_beta1.ebuild
new file mode 100644
index 000000000000..504aadd08a1e
--- /dev/null
+++ b/media-sound/picard/picard-2.0.0_beta1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+DISTUTILS_SINGLE_IMPL=1
+DISABLE_AUTOFORMATTING=true
+
+inherit distutils-r1 readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="A cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+SRC_URI="https://github.com/metabrainz/${PN}/archive/${PV/_beta1/.dev4}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+	dev-qt/qtgui:5[accessibility]
+	>=media-libs/mutagen-1.38"
+DEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+
+RESTRICT="test" # doesn't work with ebuilds
+
+# upstream quickly renamed to dev4 after buildsystem and runtime(!) were broken by 'beta1'
+S="${WORKDIR}/${P/_beta1/.dev4}"
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
+calculation and lookup of AcoustID fingerprints.
+
+Install optional package dev-python/python-discid to enable
+calculation and lookup of compact disc identifiers (disc IDs).
+
+If you are upgrading Picard and it does not start, try removing
+Picard's settings:
+	rm ~/.config/MusicBrainz/Picard.conf"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 1f77176371d3..7aad02756aca 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -2,9 +2,11 @@ DIST pulseeffects-3.1.6.tar.gz 614441 BLAKE2B bb7461532785cd0ab79d0f506b5b9bcfc0
 DIST pulseeffects-3.1.7.tar.gz 610153 BLAKE2B 64746f1eb8f16613183bac30d8e132d8001cfd9183f735fa262a02c1313f452de5cfffde33543dd0a38a629af898ca264a6864c3f005a45a6da18c00079b9f18 SHA512 7812d4b8c3fd88b533d86dcc70f3e219f3c1fe879bd8731741983c53ed00be2d3c39bc1090a674cb1347ee30a9135c86306ea1d3cb46dce7f45d1cc21fe1585c
 DIST pulseeffects-3.1.9.tar.gz 610367 BLAKE2B cb22786dd830ee80c6562eebe89be9e58c0ed4fb0c9dd1b0e1152467aee61251c50bca6516adadf7254144b42cb538e12f5e4ed1574666f5a17df702cd481703 SHA512 774830516ca078bf2286294575a7f7d96c2b6eb0c33cc83340606b187b5b757e6df58befd3386bde58efa0eaeac31bb5aab182ca729c9104577679467159001f
 DIST pulseeffects-3.2.0.tar.gz 612008 BLAKE2B babb92f3186bcb2eb3c4a8cb130d45486fa2e3c72cc2d77d0eb8f7356203f5acc45dcdeb72615c1583e10dcc9ec5c55b0eabfe4740f0eb46e4d2b79f57643552 SHA512 b34412ef7037db30b7467b1f3125bee8be5813075bbd641f9144d5519c568b7e25a143b6a922550cdbc20c8954cc9a692d295238f137a11510707746d40a2147
+DIST pulseeffects-3.2.1.tar.gz 614923 BLAKE2B fc6f382c60bafedb5439c0e395c6eb3e54548537e5190d4600d63d952addc32f41db9331d43678209ea856cef5a49fc5b85a1065f4832693d8e329097042961c SHA512 624c30dbf3510a4271bb83292cb76b4473ea2e16578a1bdf574f5a0ba6a63ae3cc9a93cb8e6808e810fe7bcfaa5f2cf5b981c6d2f1666f71cf397afdd1513480
 EBUILD pulseeffects-3.1.6.ebuild 1475 BLAKE2B 95ea87508855071328eb7edd3084cbd37073a26961521f8e904d38ef251e75cf153f55ab5eb51abaeb3846d5c039dc383c221add04ecaa41fa50f2db0ac19b89 SHA512 a87f42554f3447cf2f19cdbd005f45c60ade186b3c72e24442b4e8fefb2665be6854fb80a74ccccfbdfadc7edd0fdd70649bc028a61eae826d5400340f07431f
 EBUILD pulseeffects-3.1.7.ebuild 1476 BLAKE2B 1c762d2cf0bade571318f2c9853070280e40b5199f780c98bb7c1feb2e53282089ba253707ffc13f3fd2ecdfda8d9b3f48190c277321a642b853d4e9a738663f SHA512 561b5321846876478043da2ea5bfbf00a7c24f7fb2d0afb7420219084d5bc937ea686a627f4e388023c3ce640fc20ec345e5053b00d323ef264eff3c893eac84
 EBUILD pulseeffects-3.1.9.ebuild 1476 BLAKE2B 1c762d2cf0bade571318f2c9853070280e40b5199f780c98bb7c1feb2e53282089ba253707ffc13f3fd2ecdfda8d9b3f48190c277321a642b853d4e9a738663f SHA512 561b5321846876478043da2ea5bfbf00a7c24f7fb2d0afb7420219084d5bc937ea686a627f4e388023c3ce640fc20ec345e5053b00d323ef264eff3c893eac84
 EBUILD pulseeffects-3.2.0.ebuild 1521 BLAKE2B bf6b2765bc7f35a774bc81c93a4554439fa0f46c914a8aaca8d8e9a352aa180fec2565f617113da8b6e8199753017812a289fa967b332b7d2bacd97ebb75391b SHA512 04c6f8ec7a4ddcbfe4ad4184f759790987efcc15e105f486ca7ec74cabca5a92514af0dff4f041cf9e196b92f615a2df2827a8fe4bf6deb4f0270e006a1c023f
-EBUILD pulseeffects-9999.ebuild 1534 BLAKE2B 826872e04679ab3775eaf0ae09b035e756032d78f1d02c42b95216f02ff3dc374e190180e547b815dac2dee102bd201f5374a2bcd8f0f37868e7100fcbe12b7a SHA512 98a051fe82f45160b1bba24bf950765de2a6438acb927d9218ecd6167548a4d1f0c716ff450da9ae726bc32ac092b276b47a17b90422bcaaaf33e6d6496bf5d5
+EBUILD pulseeffects-3.2.1.ebuild 1521 BLAKE2B 6e43feed3592c0a1d546c943fc7c29ac334d159764e35208e1556ce6c0c74a2d258451a622f6e5d6aedbdd92f8f1703d0f7c858cd0cb097c279bf79f436d0e45 SHA512 886c14d9e24b9f8962154f777f4c69be6579635588dd2af9a961e996bc3c174de67823c42d854da436a236e149291ddf77cc2eabd39b8d6d295a263cd9e6af69
+EBUILD pulseeffects-9999.ebuild 1521 BLAKE2B 6e43feed3592c0a1d546c943fc7c29ac334d159764e35208e1556ce6c0c74a2d258451a622f6e5d6aedbdd92f8f1703d0f7c858cd0cb097c279bf79f436d0e45 SHA512 886c14d9e24b9f8962154f777f4c69be6579635588dd2af9a961e996bc3c174de67823c42d854da436a236e149291ddf77cc2eabd39b8d6d295a263cd9e6af69
 MISC metadata.xml 607 BLAKE2B b9f1bd8b2afd83f2e07b1d5a3c1a82fd1ff7de67182316d868890375b1144edf292181c702fa274da87bd0cc43a5e967ed6f379d0e85764a31834a4ddb3c8c8e SHA512 fa5780c3149aad1d3c5edf76356d521942a85271576f868598c54a7010cf3d31366ad08aa80402479addf8f69111973e7e814abc2df17ea7d0273a5e2a749ac2
diff --git a/media-sound/pulseeffects/pulseeffects-3.2.1.ebuild b/media-sound/pulseeffects/pulseeffects-3.2.1.ebuild
new file mode 100644
index 000000000000..51e0313a1223
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-3.2.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit gnome2-utils meson python-r1
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	${PYTHON_DEPS}
+	python_targets_python3_4? ( dev-python/configparser )
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
+	media-plugins/swh-plugins
+	>=x11-libs/gtk+-3.18:3
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
+	>=media-libs/lilv-0.24.2-r1
+	>=media-plugins/calf-0.90.0[lv2]
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	>=media-plugins/gst-plugins-bs2b-1.12.0:1.0
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+"
+RDEPEND="${DEPEND}
+	media-sound/pulseaudio[equalizer]
+"
+
+pkg_preinst(){
+	gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+}
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index 58b637a0b4d7..51e0313a1223 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -14,7 +14,6 @@ if [[ ${PV} == *9999 ]];then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="${HOMEPAGE}"
-	KEYWORDS=""
 else
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~x86 ~amd64"
diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest
index b156fb025d70..ee019b73b15f 100644
--- a/media-sound/twolame/Manifest
+++ b/media-sound/twolame/Manifest
@@ -1,5 +1,5 @@
 AUX 0.3.13-perl-tests.patch 779 BLAKE2B eba221a58a16dc22ec7e6a10388045db6a2b2535a9f0a55e47a01315aa0c0121c1473aa6ff9f53b7bcf4b70a849a0b19bfe3125213f558c17ecb1d4fd1349376 SHA512 1c483daf75991fa6d390360d9108803f65fa894745140d3955f73ce8e87eb813a068efa810988ac462ed22ae0bf3d0f95b63feb5c823ce3bfa3a0dc9b9a8f413
 DIST twolame-0.3.13.tar.gz 660415 BLAKE2B 741e91983546241b984ce95ef3b1c3b00ff2c1e84f496961749b13b932a1c3fdcd44a3fde3a24e44d9a3ff9e859e64780ad60949f827d986608c51c1afe44912 SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7
 EBUILD twolame-0.3.13-r1.ebuild 1278 BLAKE2B c05844c52abfcb8efe905b6dce55f1edd0debbebf9bb34045868f14668febdee46b2fcbd4e874187b6063ac398c73becacceae53197819a7ab5b9aa2ff097f2d SHA512 7bd73ac55b501c24bd9d46946412bdd784e3d11036863b185f81f8a91d1ebdbbc0a12ab9567e8dc5cd1335f61aa6276c976db34464d474905192835cb2a4e8c3
-EBUILD twolame-0.3.13-r2.ebuild 1396 BLAKE2B 726523db64818d25a45438e35f92755cbb6b813667b7edc6ecf9045cdb73497f8c3152650c94354e71322fdd0b519a179a1a5921a9c4a51bb49f1042843cdc2f SHA512 aa876984500c4acc5e44b57979b91105a2e357ed1f678e4943179b71f620fe26426600551e67f10e3298f3b46afea2f881ebc6c9632ca3864b4ab8e83183ad2d
+EBUILD twolame-0.3.13-r2.ebuild 1395 BLAKE2B f7f56565716b0b5e85ecb6f664b88c0d41859b99a012bdc89a64e4161984d09ce7a3b1b2d349b44f4316010d0134d12b09c83fe97eb4d1019617b4f235bd0e1d SHA512 a20d13298ac058438e68dcbc7928af3435fd25a30663566f7bd3a5305c6277374722d5838973cdf056fd92bcfb694f3400c6f84e3b4a909a6ebc90e1e3224b23
 MISC metadata.xml 330 BLAKE2B 71d39da341e5e41047c01d3b77c1090a4d1304c7ae915832d6cebe103c52cee3d0d27dd0b09c66d775efb4ee3bec3696bd6f27ca5cb78acc2a563f3992a26fc2 SHA512 4ef98f0ddd18034ac0ea2e93a84560e62b02c3ee6186f980b20733d88f68e36f3724f2b2b8c138393f9c6da1b4b943f318fcc85b5f57817fbaac33d68e4b6ea8
diff --git a/media-sound/twolame/twolame-0.3.13-r2.ebuild b/media-sound/twolame/twolame-0.3.13-r2.ebuild
index 012958ca1cfb..43c58553aad6 100644
--- a/media-sound/twolame/twolame-0.3.13-r2.ebuild
+++ b/media-sound/twolame/twolame-0.3.13-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]