gentoo resync : 11.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-11 16:09:52 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-11 16:09:52 +0000
commit: f78108598211053d41752a83e0345441bb9014ae (patch)
tree: dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /media-sound
parent: dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff)
61 files changed, 829 insertions, 492 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 8fe49c9b16db..d84bf0a1d1d5 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index d15f0d27fc8c..b78e52886b1a 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.27.zip 557045 BLAKE2B 8f341f7217c1a98732bdfe5e4383c6718476714a4f37f629852f46a40c5e50711194d281dafde16293d45bd0c70c9b7506f5d426db03249ba2358b0c76142941 SHA512 006313ef9fcae652996339a682d308a6e931da9692b4662e3272c8bee73a3803dd9aeb54189cb464c68593473339201b20af6b291524ea2f096567053131e7b6
 DIST abcMIDI-2017.12.20.zip 558729 BLAKE2B 8f4ea8e1f162318f4d0abacab2f4f793e9acc6bbe4c1dc549c80a5d30ece9a5938fe0c3477ce5760cf87dff87dd70110ddea3e96a4ec2a3221bbcda1032cedd4 SHA512 3aa198e285e29d716953ab87b9a68a492b13dfba9121664c5457bd4ac1d0f210b4d4780a7c543b65c8b318ec99b547e54f4a30ec600f5608699e1eb7e4d57998
 DIST abcMIDI-2018.01.02.zip 558817 BLAKE2B 6712e12397a793d37ca1e5ecbd8ec42e07e15c4a74addb01a4327b899f469957d3bbece9f627efe65657ded65f399a0d80eade6d1086e6842f8268c68c74a3ef SHA512 2862437f61b08e0fbcb3b456a65f1fd516e3c923376cad7ddc9a09324d67f0f2ff5b3b0466552a42ddd9f9ec70aefed8a0d41a7e968dc0d89b8b9c160ae49700
+DIST abcMIDI-2018.02.07.zip 561598 BLAKE2B 1c699521796c9610f4b538f5bc60ab2afef311289f820a820ddd283c387a376f334dc6744038714f5908615ccdbcded750a86ea84645aa90abce0dec3c92e153 SHA512 c38b6f896c75c7adf17239b0403dc8896ccce05bfacb8329150d8c04c3a7a0db6c3be37ae8d7758f342a86a582957fb11dd100cd5c51211e206aef4de89a7b40
 EBUILD abcmidi-2017.11.27.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001
 EBUILD abcmidi-2017.12.20.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001
 EBUILD abcmidi-2018.01.02.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001
+EBUILD abcmidi-2018.02.07.ebuild 794 BLAKE2B b90aae5681e9bd8fce4f4af39d21c857c39d1ff9f68bfc1a5351b17bec62288050dfe97aa3b3b7b4b28eb31e50f828ebd14a3d2caca06eab8180f984a5dc9be4 SHA512 c0afa40d4df71348b79c249a93848a09f1a869e6b1bc04b5dbe9a3e5ba5ca673c01efa3ae55c24a1c75028963a7910f9faeb1c8e9d44d733b1c388d722250a91
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2018.02.07.ebuild b/media-sound/abcmidi/abcmidi-2018.02.07.ebuild
new file mode 100644
index 000000000000..f34842b302b9
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2018.02.07.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 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/audacious/Manifest b/media-sound/audacious/Manifest
index 5a1db260a19e..15cfac2092f6 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,6 +1,6 @@
 DIST audacious-3.9-gtk3.tar.bz2 600249 BLAKE2B 08559eafc85236e8e881d0cbe6f08e29c82baf0fc46b9209f1d3eee290460260bfa99e6e8f26940f8c6854f3782da24061226ebdb416b6249d10914093e16276 SHA512 6ff98d027c13b30ea9600a9aba914ec993c69826199b8dc303cb60cebdf2af06a7e3dd4af1d34a86343be5485848a57c8a29e48d2a45a33945585550de4e5f9c
 DIST audacious-3.9.tar.bz2 599488 BLAKE2B 2288fe6919c1770cd283af809629fda72186cc0b87a42821f5fb9b7a20c8e7cd5bc00611d10677a82877c5ebc8a1b5ad728626027b95cc875b66dda732b8747f SHA512 d8ef24c91c84bfa80831075cd9a12fc4bf02cec8bc96bcfa5a941254d194cccdc482482b1c015bc63e1142718c2221034c0f3a87e2cb6e4daf3b4cc428328aaa
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
-EBUILD audacious-3.9.ebuild 2115 BLAKE2B 8db5d409fae6c592150f5b9129f9eb891e79a481f4ac8ec186ca5d77e386297cd832cf901745db2d0852fea9e18b571f4914a455488e101fb69dcb5cad0d352b SHA512 bbd9c0b7549ec8e6da84a6a7ea6529b119ed41118d64f5c04eb2f637decaadb4cff530b589f90d9e402f62dd6fd9be94aa2fd8b0bb5a2273702d06b3b0a6cba9
-EBUILD audacious-9999.ebuild 2115 BLAKE2B 8db5d409fae6c592150f5b9129f9eb891e79a481f4ac8ec186ca5d77e386297cd832cf901745db2d0852fea9e18b571f4914a455488e101fb69dcb5cad0d352b SHA512 bbd9c0b7549ec8e6da84a6a7ea6529b119ed41118d64f5c04eb2f637decaadb4cff530b589f90d9e402f62dd6fd9be94aa2fd8b0bb5a2273702d06b3b0a6cba9
+EBUILD audacious-3.9.ebuild 2118 BLAKE2B a56f92b3c6b166cfbb8a32f8819ac54b055a9bdf193049e20b450f4ce7f7e149db255876b9ae826abf5083afaabdcec4c6c757117691f50dd587721c106cb226 SHA512 6f65840eb3b70d0f9cc0aae6617754c5563e014db904a572b159cd5746c21baae0ad71d575e5b8756d869edb743f8da25410522c0d4d3e1c7e9da798dec0fbdc
+EBUILD audacious-9999.ebuild 2118 BLAKE2B a56f92b3c6b166cfbb8a32f8819ac54b055a9bdf193049e20b450f4ce7f7e149db255876b9ae826abf5083afaabdcec4c6c757117691f50dd587721c106cb226 SHA512 6f65840eb3b70d0f9cc0aae6617754c5563e014db904a572b159cd5746c21baae0ad71d575e5b8756d869edb743f8da25410522c0d4d3e1c7e9da798dec0fbdc
 MISC metadata.xml 486 BLAKE2B 982e0b5a578375d9d67369cf92edcef934c8227e6469aca89417634aca805dea8eba386033a575458d55cce34aceb6adf1de8fdcf3fb3a255c853d6c3be7629d SHA512 365b810cf7b096c86804a87d06a522b5a151559035a1ff5694153081426f5565d6465000bc9618acefc403bda9f675a048aea4dbd3af7dfc25200dd16a1c1dec
diff --git a/media-sound/audacious/audacious-3.9.ebuild b/media-sound/audacious/audacious-3.9.ebuild
index d2b1efbb4486..dea37f7b001f 100644
--- a/media-sound/audacious/audacious-3.9.ebuild
+++ b/media-sound/audacious/audacious-3.9.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
@@ -9,15 +9,15 @@ MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
+HOMEPAGE="https://audacious-media-player.org/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
 else
 	SRC_URI="
-		!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-		gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
+		!gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+		gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild
index d2b1efbb4486..dea37f7b001f 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-9999.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
@@ -9,15 +9,15 @@ MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
+HOMEPAGE="https://audacious-media-player.org/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
 else
 	SRC_URI="
-		!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-		gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
+		!gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+		gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index cd314cccc1a9..0529b53c3f02 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -3,4 +3,4 @@ AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195
 DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
 EBUILD clementine-1.3.1_p20171113.ebuild 4949 BLAKE2B c191c95fe3eeed9a429120b212e449b6bec7de077f0da771612fb5a3d04c3b3d64f34c92ba48fb13037f930a243695fe0768ce0df03b877f7f4479dd8bcc6d48 SHA512 5a6038ab815b894e46c1f5d84c73754a3265e105b7aca76e4cb828749d3fad64fd2ea5ea153dd26ebb602bcdd6510a185c6547df5d5e4950372a1e8ce7cc6020
 EBUILD clementine-9999.ebuild 5178 BLAKE2B 8dc7dd9b86b6860c5eab23ec4da3f4c29e19df4a6cdceae5c1fef1070fd2641d639c1575c6cffa35478b0f3a51439be693eb00f716ae430c8166955801a9c534 SHA512 d90eba077e830647838ee437a167f4c2148dfccbbffb5afd756a10d92689300b363b39dd8766fbf047c7ba8c71e5e9857dcc003459d2a32629a9007b153cf58b
-MISC metadata.xml 1415 BLAKE2B 9bdad36fc6b032413a003f93cb53ccc439d6dc437d8ab6b7da03ea148a550eafe5ec6910c984e90abf39bd4a427567a7e5de98fea8a36ed54452fc822ef28dda SHA512 02122e10260ba62b72ea2a5de32eb45fb1578cfb20f67294467ff2fcc1ac78f917dc415cf0c5dd587c509c5e05420a07c7c75379eb88fd97f03b962c77fd2213
+MISC metadata.xml 1270 BLAKE2B 42b3ad43defebc30898db95bac41edde89d345e4776fa81f84581f8f35df8fa962024f0d08e84bfceba1080966988308434c7aac90d244ead02cc3a1fe01c58e SHA512 9d69291b66803e4dbe1ca50309891fcd9ee5ad5264bb7827a88a550367d770482744f3b5689f60a584b3fda7614cd27743085492dc72727275b470b225b96cf4
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
index 21fd21a75522..cb7616600c73 100644
--- a/media-sound/clementine/metadata.xml
+++ b/media-sound/clementine/metadata.xml
@@ -4,12 +4,10 @@
 	<maintainer type="person">
 		<email>fatzer2@gmail.com</email>
 		<name>Fat-Zer</name>
-		<description>Proxied maintainer. Assign bugs to him</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
-		<description>Proxy maintainer for Fat-Zer. Please CC on bugs</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index a1da9ef15e80..6e731f8db652 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -1,5 +1,5 @@
 DIST flacon-3.1.1.tar.gz 431743 BLAKE2B 491919b31e0f19993c01c8a55145f1f6db7465e10112b7d3862ca2f66f15a534501248d682258fa944d0ac5de1d716c80a98f8329a4f62e22074dd397d9a03da SHA512 13b1abc2edba73e30c9a1b729650e8001a5b8de7e34fe2b599f28277c347539fb50679f8a0e608c87eb7feb1e05e26c7f71fbc3c696f0fa29ae8ae9e20e63cfd
 DIST flacon-4.0.0.tar.gz 1294289 BLAKE2B 3afadc3545493558a5eadb7720509410fb448fed1e1fc5511f0ce477ea0e6e876d19e3038d5eb77191b449f730f50e6f1e3e4eacf546b064868863ed918acdee SHA512 64efc3369f11a7345d106a253873bcaf64ff0bbfb045e3554fecdc48a86ee5d150bef06643a5bf481d6e139a45a2bfdee91e730f9aa1354a4772f0d994297b78
 EBUILD flacon-3.1.1.ebuild 2611 BLAKE2B 4aa79f517e9519e72e0016e8223ab4d9cf594151e8659e7e995e7d9a466c40bfbd563fe9ab71d300c8c41f59d61219f8706fc2428e6c52f2cc312694cd739c09 SHA512 09e2ae615acc0d69861ef1eaf8ed6a45b5548a5fb09191ee4f32200d0b0ff61db90f2e7212636183b1d250fb1207ed4b5d041d17173b8a8c1e9a029e13ea6a24
-EBUILD flacon-4.0.0.ebuild 2474 BLAKE2B 36809167053281a401113a35d8e4da54899d8fc2fd1471c2302b63df6d4896a58e52e5b4f98c17747842fb45f96002626bbaf2d713749613f672e36937161b4d SHA512 a9cad90cb050fe6f981dcde7416c7ab81e93c8828a056528e0e08ae0207dde7854e2973c6d8d09b3ca803ab143206a2ba685bafa3f1cbbbbd0375febd4957e6e
+EBUILD flacon-4.0.0.ebuild 2473 BLAKE2B f86ca417fdb328ae9a42d0ddbb582bd13fb6b9330837f8f850133e1e7c2a6bd4f49856657a3c920654c4c055eadf54b14f14b5b58998a7f063fd06e0ff72fbb3 SHA512 7c11f54921fe5b1ab61a661d53de15132161c595a27ba41a5a4d88c7d1fc8298f2e57ec89babb5d27a3f4a0777b3b5d82bd97388a730af3e0ec6b50ee2f513d5
 MISC metadata.xml 505 BLAKE2B 95e22c79d22d438696eaca5a304e1ac5660b049511a59bf6ed79aeedf9039b24fcd4de3ee3babc4c34b9e471a615ffcc1a36a9156350e430dc6fa6ca6bbd9923 SHA512 6979e575ee4e5230e7674fa77ece86fc27b983af03c1dfd938c3b3ca9e8f0e89f7ab2c99eaecdd1f512e70fd9d1004963669bfefa68176d40c6460272ac334dc
diff --git a/media-sound/flacon/flacon-4.0.0.ebuild b/media-sound/flacon/flacon-4.0.0.ebuild
index de50d8c1ff9a..cb11e38d9e9e 100644
--- a/media-sound/flacon/flacon-4.0.0.ebuild
+++ b/media-sound/flacon/flacon-4.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
index 91ac0b19ae55..3665ab46f381 100644
--- a/media-sound/gmusicbrowser/Manifest
+++ b/media-sound/gmusicbrowser/Manifest
@@ -3,4 +3,4 @@ DIST gmusicbrowser-1.1.15_p20160530.tar.gz 1305616 BLAKE2B e67d239a4483624d29881
 EBUILD gmusicbrowser-1.1.15-r3.ebuild 1683 BLAKE2B f318607739966158d52a3b065d6a2fb729fd81ccc5295041f3a248e6c8b63c9b51ff537bab4b30d15f0fec7b97133515fd58957a7cc4cc8b47fc59bfede1f8b1 SHA512 8936dcbf217f9e12b041a8197ab47c16617624ab94668f96fc22ca305f6cb3efb9ac8c14a23e2880a0917bcd5b41087ec988baa0e27f84f5f805a0e41e88639d
 EBUILD gmusicbrowser-1.1.15_p20160530.ebuild 1744 BLAKE2B fa338b5221097ced136ddabe53a0d71bf981a18f2c5cdf155b6dd8dbd3e7606fb91e26592d85293e57aaa5b49c4e2542ac2b2c2bc145a56ad8a3ca5c0302cde6 SHA512 5a1a91e86e095ffb5c41466c27796b2e6a5158029bf57c8ce61c0f7c557bfa2bc7fc07c4009ae97d4b91964e6c4b46c6f053c358fec06210ce2d2f3e134a456b
 EBUILD gmusicbrowser-9999.ebuild 1744 BLAKE2B fa338b5221097ced136ddabe53a0d71bf981a18f2c5cdf155b6dd8dbd3e7606fb91e26592d85293e57aaa5b49c4e2542ac2b2c2bc145a56ad8a3ca5c0302cde6 SHA512 5a1a91e86e095ffb5c41466c27796b2e6a5158029bf57c8ce61c0f7c557bfa2bc7fc07c4009ae97d4b91964e6c4b46c6f053c358fec06210ce2d2f3e134a456b
-MISC metadata.xml 513 BLAKE2B d4600880a9d2734dd749b7bc77a10ac55827a4a3b237802a7724c15617890ac86acba0e9b8288dbbd84ea3024697bec51c96024b66c76348b0422266df4ff8ba SHA512 e08639e639e8262a2ae578ffaab838d1169212ad321f1e60b491465d4eedf54b2733428cc71dfaffd99bd2664d943b4fa15a113fbbb0fb60abc2eee192882173
+MISC metadata.xml 465 BLAKE2B 53caced65e537cd80208bd2dad2853b72efb79925ddbf4009153483207f17bc7337312870d47e65ea971b3c944286875882d06d1bfc7b7e9c0bb88695d5f8ce3 SHA512 ff760d056bb2f67c021cfca327ad1f7f5be33264a6f03ec657e83a4ea7c14800d6f51340cb6ecad895bf2dfb8db38767982e63b030a9923de16820b7558f8497
diff --git a/media-sound/gmusicbrowser/metadata.xml b/media-sound/gmusicbrowser/metadata.xml
index 6c2c0dcaa759..0daa038b6d94 100644
--- a/media-sound/gmusicbrowser/metadata.xml
+++ b/media-sound/gmusicbrowser/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>Sergiy.Borodych@gmail.com</email>
 		<name>Sergiy Borodych</name>
-		<description>Proxied maintainer</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/lyvi/Manifest b/media-sound/lyvi/Manifest
index be16c4ac6984..fc2a0d5d2561 100644
--- a/media-sound/lyvi/Manifest
+++ b/media-sound/lyvi/Manifest
@@ -1,3 +1,3 @@
 DIST lyvi-2.0.0.tar.gz 19307 BLAKE2B 009af146f917ed7867c737a78c50261b688b4b78e104518338462b3f1372656298bcda5ef0b70f8a84db800488a57ba4c665884ff5fa2f992d53d3940e204f47 SHA512 0248ceb16436be427ab38769824ce4be48998997b1997f90ddef751105e7449cff7d865e9a5895fb67c79da0eaf394baefe1a77bdc9e6c5e2b6498d64128b045
 EBUILD lyvi-2.0.0.ebuild 838 BLAKE2B 3e190435e06f8ee0f6752e64296c9d102698584cbfeafd4d07ba16a47c63e5f972fb01c069f05fada4a4e953e7a73b15718cfd0d5e7d446203a97a61a2c1147a SHA512 4820d43681d23e2f74700a1fbc68b8fe8045305739ab0e705b016f41bc76b478bbb026a7af4fe1098cdd1dbee8ee6f8a2265274479da8be57f69931f232ef35e
-MISC metadata.xml 722 BLAKE2B 04b6be09459bfa7f09078f77e7ce392ebe053c9b55258d62d74cbe474a1cc4dc15cac14408d61295474e27c69106f02e6c34e32ce969269749e52e9a00255271 SHA512 b7427323c5b5b7ee9696ebb90070372ed7dfbb44fba41f47581b901e90e622550503d7585166c92411fae8dcd11ad93ed14b62168c71ce42e0933a41b1617426
+MISC metadata.xml 676 BLAKE2B 615cc20d4424b7e765e61c0fdd777a4e62df3aa693db969ea4311122839753d45609f89a727249b903dd549c9e256614657c1427ab13bb54719ee97c51d33d6b SHA512 5214e99e32ebff6a3c42380975b5575e9e1940972e9ce02f07147c06335a208b8f941438d9cd60803c05b3767138be0b66950ed8a7fd17d136d5830940d854a1
diff --git a/media-sound/lyvi/metadata.xml b/media-sound/lyvi/metadata.xml
index af22d20349e4..ca6b97825291 100644
--- a/media-sound/lyvi/metadata.xml
+++ b/media-sound/lyvi/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>witold.pilat@gmail.com</email>
 		<name>Witold Piłat</name>
-		<description>Proxy maintainer</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index a02e09f65978..5297f504faf4 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,13 +1,10 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
 AUX mpd-0.20.4.init 690 BLAKE2B f7674cb5d20d307c63c3fd438a364c0bf660c63fafc21553ad5f6706ff038ee7f74786a586f58656bebdf3b79456f0bb14c137728c748380da5b8204b2958947 SHA512 d4c60d7b5b6e4067439be96aaa9d8d6f7bd7607ad42a618b04af94815cdbe900e06f11c6897f96cab623d6859d681feb11fa02f36fdce4841ed59c88ef86666f
 AUX mpd-0.20.4.logrotate 79 BLAKE2B fcff807fb7557d480378ae6712f598147c9dbc3381ca89b21529277bfc636448e474b610096eae5c02963bc5aa5cf1055f0a9bbde36f2cc8d178e373a755fa84 SHA512 b4616307eb4b06e42a53120bb37276ea19cb1b3096094214062835f71093a1d196bc515b6b6f1e23dbd83a49151565807071959408c4f1078d95925660d3b324
-AUX mpd-0.9.15-systemd.patch 3056 BLAKE2B 3198677bb60c248277dc0b1505aa7ce07663cb29379022fd3dcab2cb16252d90335d009c02e4d2973ed70225a9b4cbaadfea2816f54ab0101c07fbe905687ba6 SHA512 c9f8b909121f6f3b08ca4bf37ae744aa1468a306e8671681babac228aa5d4b528d094214e2596a862d0b685d01a448b6fd6b8170d6990e10f387f1e498c9dd3b
 AUX mpd.logrotate 199 BLAKE2B 5aa7be688734ae41f3b209e0efade9d517c0e6470dc49d46aa29a0d1a0205bde0ffff4bbb4ba53b3d29212ad50fe1fc8271344e6dd626871bec7f6d7764a52db SHA512 c55ef8f0e691ef0b358e5dc81a206328de4ccef449959fd7e6f9e95e07cbbee7446639278ebe6f4517063c9a6169e07bca0109958dc722a2caea1503693410ae
 AUX mpd2.init 727 BLAKE2B e6608d468be6fff5178558e549e28995169f171467bfd57c1821c3b479856633c2ba5c259013ec8d94bee9f9c61579dbbc9218091002825becabde74dca2e6cf SHA512 be2b52b3b69dcfb34e7753dce908c4f3c5b2d2e768c9177dbf06d72be487ccb2f2b58c292c0e19c5c6faf83bcabd1acb8fc6f1214b2de030b005b7759566892a
-DIST mpd-0.19.19.tar.xz 707356 BLAKE2B bb9cade62cfbb64fd5f2db28e8c3ca1847efaf6b4ec818ceb935d5dff292afdbc0a59520f23e20c270bccd79e52e8e4bc9083535c438c1967dd14b0d56b995cf SHA512 949bfab2aa5dffb4089ce2023accc934648091d36768f8e4c75f62b4038e21db1e2ef3bb07a0f1cf6a91d0532cac8e7146be948d84dc4d7cdc5b252b7d815b64
 DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c
 DIST mpd-0.20.12.tar.xz 781072 BLAKE2B 0f305efa94dca844ebc9e4548d0f57ce01c0274c49f40fe3fc8510b8f2748f2cf623125c16da382a8495aa6eeb1a8b9707a3bb46a5fa8a0657c9ffa11fbcb5dc SHA512 3e221edc71cc65f9da46aa4f1d0bc2f8ca701cc4a103ea8efb08191918312b2f3b0023288e3dcabe0779e81ee6f628773d779462e09a55f2c090cca0e3d099af
-EBUILD mpd-0.19.19.ebuild 7648 BLAKE2B 26bd3442456b1bbfefd6a6c2d2f032682833aceb9603288e4a2b4566bc9b13edd21a96da3895ad472366f6cdb9764cf318c00d77186ff675c52989944ecbcfb2 SHA512 d9be4e7bd28c6bf7f872dc59c374d087e9d89474efd56d4809cdd5787d6cd45a9ad0670c04663915ca3620cd6f818f22710f08b849e00c6b3df441e443976b0a
-EBUILD mpd-0.20.10.ebuild 7247 BLAKE2B 0baae4dc1c000e22f290f4fa148a07d2719d58323e22a139b4f22785e288f2765077dbfd7c9a7ab6a41b0bcf4248255423f510ab0b86612c7c9264ba56d4d17b SHA512 3ef60f912b800eaba381fd5ea8bef6e6a694dfc98c4e46543bce13ef10f7707b28925b044ee8a48b5fc9240ef4c5f8deb1b0b5f6f608fe8619a34e42c00586de
+EBUILD mpd-0.20.10.ebuild 7246 BLAKE2B beb040eb0eca988c33fa5aef07022c3eeeda6afbc50d86ba8ee0f4d96137935ebf5abb3e094130de5cd83dec109527e06c3b95d2178f856a214896615debba48 SHA512 53d08548f75b6be0530c0ff6f0e4210e99020ff79f36515b1abbf4bf7c3db5e64bdf0c3a5396c5c89d07e37f23c28dc81d7e4a75bfeb17970e53d0892e84fe44
 EBUILD mpd-0.20.12.ebuild 7314 BLAKE2B dde2d3d78b80234f8019a533ea57314336590b4fc6c6488a3c9fa411bbc0e92f3a89a99ac9b99113f68c281a24b3dc31713deaafb37c915fe4d47e3ca05510d0 SHA512 a7c94315bf5213daa24015c90ab01468403a2dae5018f56a6a33f8c6b09e6a0433a49336c1e29f1cfca4439f70c622465a5c9d3e367eeb1ad24bf965fd340a31
-MISC metadata.xml 2496 BLAKE2B d4e284d95b673e3e2ace7d681bcb577c1d3ef2d43f708de060ed6a595a478e82fccf3487587d1f71c7f1cbbd510c0bc698e0a78806968a1332f7174aceef6319 SHA512 712f6b0c5fc58250521ccebd68b5af708868a1f1b9c398eec3d24434206bd56da70c26dcab52793826fd82d456c0c608ff21558ab514faf329face07e0aae1cc
+MISC metadata.xml 2449 BLAKE2B 33ffee8d5e8872a91eabb6006590828efe68da58117872aa4d36471cb7af858e00ec36e1193dd4ed08469b9522e9b953d7a5d0726890a8cf1333420c7ae9f2a2 SHA512 3092f8928c4dc74118306584f3766f78559672613336668c7e0dc8cffb0f46413d8d046b7fd54f6d69e8ac171e571666d8f5defac36d629bc0091e2550660e02
diff --git a/media-sound/mpd/files/mpd-0.9.15-systemd.patch b/media-sound/mpd/files/mpd-0.9.15-systemd.patch
deleted file mode 100644
index cd03ebe16855..000000000000
--- a/media-sound/mpd/files/mpd-0.9.15-systemd.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Description: transition to libsystemd from deprecated libsystemd-daemon
- systemd 209 merged the various libsystemd-* libraries into a single
- libsystemd.so, so we check for that instead and rename the configure
- option, define, etc accordingly.
-Author: Florian Schlichting <fsfs@debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779762
-Forwarded: not-needed (solved in a less invasive and backward-compatible way upstream)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -572,10 +572,10 @@
- MPD_DEPENDS([enable_sqlite], [enable_glib],
- 	[Cannot use --enable-sqlite with --disable-glib])
- 
--AC_ARG_ENABLE(systemd-daemon,
--	AS_HELP_STRING([--enable-systemd-daemon],
--		[use the systemd daemon library (default=auto)]),,
--	[enable_systemd_daemon=$linux_auto])
-+AC_ARG_ENABLE(systemd,
-+	AS_HELP_STRING([--enable-systemd],
-+		[use the systemd library (default=auto)]),,
-+	[enable_systemd=$linux_auto])
- 
- AC_ARG_ENABLE(tcp,
- 	AS_HELP_STRING([--disable-tcp],
-@@ -762,11 +762,11 @@
- 	AC_MSG_ERROR([No client interfaces configured!])
- fi
- 
--MPD_AUTO_PKG(systemd_daemon, SYSTEMD_DAEMON, libsystemd-daemon,
--	[systemd activation], [libsystemd-daemon not found])
--AM_CONDITIONAL(ENABLE_SYSTEMD_DAEMON, test x$enable_systemd_daemon = xyes)
--if test x$enable_systemd_daemon = xyes; then
--	AC_DEFINE([ENABLE_SYSTEMD_DAEMON], 1, [Define to use the systemd daemon library])
-+MPD_AUTO_PKG(systemd, SYSTEMD, libsystemd,
-+	[systemd activation], [libsystemd not found])
-+AM_CONDITIONAL(ENABLE_SYSTEMD, test x$enable_systemd = xyes)
-+if test x$enable_systemd = xyes; then
-+	AC_DEFINE([ENABLE_SYSTEMD], 1, [Define to use the systemd library])
- fi
- 
- dnl ---------------------------------------------------------------------------
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -58,7 +58,7 @@
- 	$(ICU_LDADD) \
- 	libutil.a \
- 	$(FS_LIBS) \
--	$(SYSTEMD_DAEMON_LIBS) \
-+	$(SYSTEMD_LIBS) \
- 	$(GLIB_LIBS)
- 
- src_mpd_SOURCES = \
---- a/config.h.in
-+++ b/config.h.in
-@@ -75,8 +75,8 @@
- /* Define to enable sqlite database support */
- #undef ENABLE_SQLITE
- 
--/* Define to use the systemd daemon library */
--#undef ENABLE_SYSTEMD_DAEMON
-+/* Define to use the systemd library */
-+#undef ENABLE_SYSTEMD
- 
- /* Define to enable the TwoLAME encoder plugin */
- #undef ENABLE_TWOLAME_ENCODER
---- a/src/Listen.cxx
-+++ b/src/Listen.cxx
-@@ -32,7 +32,7 @@
- #include <string.h>
- #include <assert.h>
- 
--#ifdef ENABLE_SYSTEMD_DAEMON
-+#ifdef ENABLE_SYSTEMD
- #include <systemd/sd-daemon.h>
- #endif
- 
-@@ -77,7 +77,7 @@
- 	}
- }
- 
--#ifdef ENABLE_SYSTEMD_DAEMON
-+#ifdef ENABLE_SYSTEMD
- 
- static bool
- listen_systemd_activation(Error &error_r)
-@@ -109,7 +109,7 @@
- 
- 	listen_socket = new ClientListener(loop, partition);
- 
--#ifdef ENABLE_SYSTEMD_DAEMON
-+#ifdef ENABLE_SYSTEMD
- 	if (listen_systemd_activation(error))
- 		return true;
- 
---- a/doc/user.xml
-+++ b/doc/user.xml
-@@ -110,7 +110,7 @@
-   libupnp-dev \
-   libavahi-client-dev \
-   libsqlite3-dev \
--  libsystemd-daemon-dev libwrap0-dev \
-+  libsystemd-dev libwrap0-dev \
-   libcppunit-dev xmlto \
-   libboost-dev \
-   libglib2.0-dev libicu-dev
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 44d02733ce25..f2736f902a38 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -17,7 +17,6 @@
     <flag name="faad">Use external faad library for AAC decoding</flag>
     <flag name="fifo">Support writing audio to a FIFO</flag>
     <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (discouraged)</flag>
-    <flag name="glib">Enable GLib usage</flag>
     <flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
     <flag name="id3tag">Support for ID3 tags</flag>
     <flag name="inotify">Use the Linux kernel inotify subsystem to notice changes to mpd music library</flag>
diff --git a/media-sound/mpd/mpd-0.19.19.ebuild b/media-sound/mpd/mpd-0.19.19.ebuild
deleted file mode 100644
index 2c72863763ad..000000000000
--- a/media-sound/mpd/mpd-0.19.19.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic linux-info multilib systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
-	+fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack
-	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
-	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
-	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
-	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	ao? ( glib )
-	gme? ( glib )
-	jack? ( glib )
-	network? ( || ( ${ENCODER_PLUGINS} )
-		glib )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	sid? ( glib )
-	soundcloud? ( glib )
-	sqlite? ( glib )
-	opus? ( ogg )
-	upnp? ( expat )
-	vorbis? ( glib )
-	wavpack? ( glib )"
-
-CDEPEND="!<sys-cluster/mpich2-1.4_rc2
-	adplug? ( media-libs/adplug )
-	alsa? ( media-sound/alsa-utils
-		media-libs/alsa-lib )
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio-paranoia )
-	curl? ( net-misc/curl )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	glib? ( dev-libs/glib:2 )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? ( dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( >=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
-	nfs? ( net-fs/libnfs )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( || ( <net-fs/samba-4.0.25[smbclient] >=net-fs/samba-4.0.25 ) )
-	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2 )
-	libsoxr? ( media-libs/soxr )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	upnp? ( net-libs/libupnp )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-	"${FILESDIR}"/${PN}-0.9.15-systemd.patch # bug 584742
-)
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-		sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local mpdconf="--enable-database --disable-roar --disable-documentation
-		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
-		--disable-solaris-output --enable-tcp --enable-un --disable-werror
-		--docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-	if use network; then
-		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output $(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)"
-	else
-		mpdconf+=" --disable-shout --disable-vorbis-encoder
-			--disable-httpd-output --disable-lame-encoder
-			--disable-twolame-encoder --disable-wave-encoder"
-	fi
-
-	if use samba || use upnp; then
-		mpdconf+=" --enable-neighbor-plugins"
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	econf \
-		$(use_enable eventfd)		\
-		$(use_enable signalfd)		\
-		$(use_enable libmpdclient)	\
-		$(use_enable expat)			\
-		$(use_enable upnp)			\
-		$(use_enable adplug)		\
-		$(use_enable alsa)			\
-		$(use_enable ao)			\
-		$(use_enable audiofile)		\
-		$(use_enable zlib)			\
-		$(use_enable bzip2)			\
-		$(use_enable cdio cdio-paranoia) \
-		$(use_enable curl)			\
-		$(use_enable samba smbclient) \
-		$(use_enable nfs)			\
-		$(use_enable debug)			\
-		$(use_enable ffmpeg)		\
-		$(use_enable fifo)			\
-		$(use_enable flac)			\
-		$(use_enable fluidsynth)	\
-		$(use_enable gme)			\
-		$(use_enable id3tag id3)	\
-		$(use_enable inotify)		\
-		$(use_enable ipv6)			\
-		$(use_enable cdio iso9660)	\
-		$(use_enable jack)			\
-		$(use_enable soundcloud)	\
-		$(use_enable tcpd libwrap)	\
-		$(use_enable libsamplerate lsr) \
-		$(use_enable libsoxr soxr)	\
-		$(use_enable mad)			\
-		$(use_enable mikmod)		\
-		$(use_enable mms)			\
-		$(use_enable modplug)		\
-		$(use_enable musepack mpc)	\
-		$(use_enable mpg123)		\
-		$(use_enable openal)		\
-		$(use_enable opus)			\
-		$(use_enable oss)			\
-		$(use_enable pipe pipe-output) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable recorder recorder-output) \
-		$(use_enable sid sidplay)	\
-		$(use_enable sndfile sndfile) \
-		$(use_enable sqlite)		\
-		$(use_enable systemd) \
-		$(use_enable vorbis)		\
-		$(use_enable wavpack)		\
-		$(use_enable wildmidi)		\
-		$(use_enable zip zzip)		\
-		$(use_enable icu)			\
-		$(use_enable glib)			\
-		$(use_enable faad aac)		\
-		$(use_with zeroconf zeroconf avahi) \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
-		${mpdconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/${PN}2.init ${PN}
-
-	systemd_newuserunit systemd/${PN}.service ${PN}.service
-	sed -i '/WantedBy=/c WantedBy=default.target' \
-		"${ED}"/usr/lib/systemd/user/mpd.service || die "sed failed"
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
-	use prefix || diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.20.10.ebuild b/media-sound/mpd/mpd-0.20.10.ebuild
index 5d387eade22f..169aa5acc382 100644
--- a/media-sound/mpd/mpd-0.20.10.ebuild
+++ b/media-sound/mpd/mpd-0.20.10.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
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
 	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
 	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 53471ac7f41f..cd4e991454ca 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,7 +1,7 @@
 DIST ncmpcpp-0.7.7.tar.bz2 443801 BLAKE2B b0bf1f6264f94fc1d0dce5b7ec8d85607427e5bf8955914fddffd8dec94850e6dd20dd83a966a25353d6ec23a61e92751d83fddec8202d9a843e0ed9e3b32077 SHA512 a0bbe85f154c40513d41e85810de86ed21109b72fb0f2bdb0b78dcbddb3770aff5422b5bb7fbac2b76634c5b9aaf843bed5fc16fc672fcd71bbae911f65c0034
 DIST ncmpcpp-0.8.1.tar.bz2 464123 BLAKE2B 0edb57fc3a0527dea085a10736ff2cdca3ea25fdbb4aac686f4c9db6403fc1ee2f0f724aa3c3411104f355ba11e76193ede2a52bc550ff9bed33261cc426dd87 SHA512 2b1b615672910f6b55d4a3e1842f677b8c72659a86dca74d9c306612038d7b765f622e4b8948f14d8a3f4fa913d413d128ed8726f70d7a09cfe95d3c1fe87d15
 DIST ncmpcpp-0.8.tar.bz2 464165 BLAKE2B 6f161ce1dcff973bc7872c777394229bfe59ae770790656a0e7d38b09d693bf82695c0b9fa301834b4428866ed2568229174558ae4989e457fd13f4bed0faf63 SHA512 b51217df85f95efa345f0484f16024bd74c1c0e22f2c2b25238335fc2f00caf81877088170f241c1d97fd328d104b19f022dc4de9895ff420f1fcbea341e7cdb
-EBUILD ncmpcpp-0.7.7.ebuild 1502 BLAKE2B e772a5d7968f84b1eaea3ef3d1953395cfc2419477cb9611a81487d73c4a780fe7e1473b0914a445724e874fde6430071e25291570439d66d384ed70eb8c992e SHA512 ccf17dfba3ab08e5826806b0fbade224e67b359210a1ea5c6cb27920c11089128d50a3e9f04327b8ad19df986d986e428ab3018f1cfe53eb8a2af67d83f3688e
+EBUILD ncmpcpp-0.7.7.ebuild 1501 BLAKE2B b4fac49d9ebca61da51109aa52b06a14f5005064d4427bb94403d534ad03ff65574ff7cbf0d0708dadc7942c51ddc93bc0260e1741ba5b75a026a2e5c726e674 SHA512 dc3691ec4e4d92f063fcccf219e3566ebc85d8b2b0bdf8134720701172108bce462ba9278b9405c556c8631df846747e5f5a2ccdfaab1b6efad58ec92e9474e1
 EBUILD ncmpcpp-0.8.1.ebuild 1372 BLAKE2B a2ae6b939b23775f98134116af42a363cbdc6ddc1f3ca266ff2e9df05efcda0ab02d9d41879fdf7d3ff14e18d83838c13068ccd0cd6482f772c86f2470c6fd42 SHA512 221b4646fafb31d9faf4876fedd0c2e52418f8a8a6e448985076cf4f862a9d1e58aa3d749790488731a1c12443b2bbb1b6a0e7a1f02fab78c6cf3b5568bc3d31
 EBUILD ncmpcpp-0.8.ebuild 1372 BLAKE2B a2ae6b939b23775f98134116af42a363cbdc6ddc1f3ca266ff2e9df05efcda0ab02d9d41879fdf7d3ff14e18d83838c13068ccd0cd6482f772c86f2470c6fd42 SHA512 221b4646fafb31d9faf4876fedd0c2e52418f8a8a6e448985076cf4f862a9d1e58aa3d749790488731a1c12443b2bbb1b6a0e7a1f02fab78c6cf3b5568bc3d31
 EBUILD ncmpcpp-9999.ebuild 1361 BLAKE2B 6b6d97e04d27221d47e420e717f4bd5a1e3290b48a11dd7cd0e1f3809a96f64555f3abb4e8dccea22282f2cd24b4368cff5b12212e433b85d39967945d13d56c SHA512 8c126b75c5ce753b537b43aae6f665258c80954900d9ae61e48e89e45860e247425fd01ef77c3707ed66db97863330a27d33d2191020684394cd60e20246b505
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
index 018a9b18aa3a..85d189cdcd0a 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="clock curl outputs taglib unicode visualizer"
 
 RDEPEND="
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index 1420e1e5ff5a..0f2a15e36dee 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -4,4 +4,4 @@ DIST pasystray-0.6.0.tar.gz 53835 BLAKE2B ef5abab45a17f6445e8cbd1e37c300aa2c1c25
 EBUILD pasystray-0.2.1.ebuild 879 BLAKE2B 978299c671a5e877c78db6903b0a00cd89a6c70964bac36c6e3b0fbbab46b5b1b8b0fefb577308d7a8009602d849080121974ccea3cf20e70a66d0cd2d5219d2 SHA512 f74684712b6d36c901c70c69953b98947eda6e79e88e78e743f0de183bd6253d9bc6d71938ceb9f6bcefd9771783555fff1749cef1f8def7dacc2d559e5ad418
 EBUILD pasystray-0.6.0-r1.ebuild 1043 BLAKE2B 780ca6c4f8585e76acfa5e82d78ac757fc22f501c83b0c21feaa522e3ef13300806080f2b11c434dff71d95449e24fc6d4b0c56679d7b0a582e22c879673246c SHA512 534ffc663633ba4cc9c7f539db311e35dd973ffc08a76b5638dc32e4d48999583e73c94863e1937ac8e66af05816e20de447e557569e86f4e06f043698f7d0b7
 EBUILD pasystray-0.6.0-r2.ebuild 1098 BLAKE2B db682d8aeb9c5897bd8cfc636d48c08a9836c6a36c9a04dd7ef1c5b05829ddfdec7b122c2021acf0a8999e9c3c0451aae9f47c5385b06243ff6a69fbda86eeb7 SHA512 6a11e33c0ce6cd4f4272978d2371b219e697c554b32a3596519eb9be7b621d3e5aff01ff308b8e912d53be4d767fc2f9e4ded71bf47244ca2d5379fc43e3c4b7
-MISC metadata.xml 681 BLAKE2B 91dc121d11678d0385f9dd68c5153a587c864c3f1623d8bc2b332d9fa6262eeb6faf127ac14eb6060fdb089e22316e33fe699fc109ef873e0829e2e191ae1c1d SHA512 bd6780d171a849af150404f3910545f45c2e47acfb8fe705fb5163a93c5cbe728fb61b7252705a2d44846ca85630137945982f0927cd043abbdff81c2053f392
+MISC metadata.xml 635 BLAKE2B 54e8f3a6f865a0caafaf253e37c517e84c5a41414c2456d34780522c25b8998cd50b2306e24d55e9c6c45e4e62bf6fc60e2f5098f63fd23e42778b0b067cb922 SHA512 97fb650bc38171c10b3678940a72b5100874aa84820b962e1b892d82555c8527bf19976076fa0017c400d7955716e7eb4747bcd8cc372198b5c84f6ec4086495
diff --git a/media-sound/pasystray/metadata.xml b/media-sound/pasystray/metadata.xml
index 778defeed5a7..0fc6cc1825ed 100644
--- a/media-sound/pasystray/metadata.xml
+++ b/media-sound/pasystray/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>lmiphay@gmail.com</email>
 		<name>Paul Healy</name>
-		<description>Proxy maintainer</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/podracer/Manifest b/media-sound/podracer/Manifest
index 9bbbef11196e..1788d50e7cfe 100644
--- a/media-sound/podracer/Manifest
+++ b/media-sound/podracer/Manifest
@@ -1,3 +1,3 @@
 DIST podracer-1.4.tar.bz2 14600 BLAKE2B f4e4250fb9c694712dcc2ee6e608f5027c38140ea88412e5329b15a1d07c147ed8100be8305e05fec8a2407b676cda55cac1dcec77bb2314dd07d247ae132953 SHA512 f1a6946299b6e32d8a86a153b531c7e6d8ec9cf175719fb8fd2f1d9974ed29469e7b1a2548c4104d7e3e1991cb8138e2970a0b6a4208b7a537dde8c2ca425dd3
-EBUILD podracer-1.4-r2.ebuild 922 BLAKE2B c4c65d5dee1496be6112ba1031e5ec23fe11735764971ff284e8e3a4bee5c50202c2a8376b854b6a70e78d665ccc2e1bc7e973b4d09c70fd9d28acebead4c677 SHA512 ba21660c5cf30dcb2fc91e7051b7be8e2eed5f74d68caae3d94c4981aa55921d244efd335ba56bf413144494dfb1c0eb16a1117b331d775c5c63c5d2ee862585
+EBUILD podracer-1.4-r2.ebuild 921 BLAKE2B 30db596d057d3b2e088ce79de7dc59cfb4b2ddfb1878a87bc2478ce9272f83ca57e6a2bc8a6c09ced1e22f962378365e7e0572c065b25595e5ecf91a5ead5b60 SHA512 0288303fa44aef64447024e109f4d15facdbe97eda8c21634246bb67a74f22b0770df4f9d010aa82013d620764833c70953b92595e681fce141b3fa5dacaf1d1
 MISC metadata.xml 245 BLAKE2B 3214da6f8e75655ce9744ef630d5e45b6af3e5fd2ff60c7e1c1c2bca05a5014c3de8c2f8d238f06bdc093cc63c0e50c35d4c4e1454d4f853bc6b2af687159e88 SHA512 e7d260d609a6e9d0a12434d38c351b2beebf4345476e50c47efb0881407e4c0e23e50f9b44540b75ed6ac18e5a6dc60254fcbdcd0ee44a37b7b3205e173bba60
diff --git a/media-sound/podracer/podracer-1.4-r2.ebuild b/media-sound/podracer/podracer-1.4-r2.ebuild
index 13ff3b40a5e5..e9e6452bf143 100644
--- a/media-sound/podracer/podracer-1.4-r2.ebuild
+++ b/media-sound/podracer/podracer-1.4-r2.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index b5232caad410..3c7380471498 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -2,9 +2,11 @@ DIST pulseeffects-3.1.5.tar.gz 612665 BLAKE2B 18fd3c8126f0ad53ac0a7c270b5cafa66c
 DIST pulseeffects-3.1.6.tar.gz 614441 BLAKE2B bb7461532785cd0ab79d0f506b5b9bcfc006779776e25870ce92b4af4e7cb0f7b3bcfe9c58180e52bdb9b9be20a14644ed8622fd3cc578dd3bdf9ff173c091b6 SHA512 efd9871c57f4b7152e4528927c7371e225980a09acacf4fcf939c468c7cb01b94b1bbb3c94cbd8879a6b41c7c4794ed5f45035a2b185b0a09b31515c964d4722
 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
 EBUILD pulseeffects-3.1.5.ebuild 1476 BLAKE2B 1c762d2cf0bade571318f2c9853070280e40b5199f780c98bb7c1feb2e53282089ba253707ffc13f3fd2ecdfda8d9b3f48190c277321a642b853d4e9a738663f SHA512 561b5321846876478043da2ea5bfbf00a7c24f7fb2d0afb7420219084d5bc937ea686a627f4e388023c3ce640fc20ec345e5053b00d323ef264eff3c893eac84
 EBUILD pulseeffects-3.1.6.ebuild 1476 BLAKE2B 1c762d2cf0bade571318f2c9853070280e40b5199f780c98bb7c1feb2e53282089ba253707ffc13f3fd2ecdfda8d9b3f48190c277321a642b853d4e9a738663f SHA512 561b5321846876478043da2ea5bfbf00a7c24f7fb2d0afb7420219084d5bc937ea686a627f4e388023c3ce640fc20ec345e5053b00d323ef264eff3c893eac84
 EBUILD pulseeffects-3.1.7.ebuild 1476 BLAKE2B 1c762d2cf0bade571318f2c9853070280e40b5199f780c98bb7c1feb2e53282089ba253707ffc13f3fd2ecdfda8d9b3f48190c277321a642b853d4e9a738663f SHA512 561b5321846876478043da2ea5bfbf00a7c24f7fb2d0afb7420219084d5bc937ea686a627f4e388023c3ce640fc20ec345e5053b00d323ef264eff3c893eac84
 EBUILD pulseeffects-3.1.9.ebuild 1476 BLAKE2B 1c762d2cf0bade571318f2c9853070280e40b5199f780c98bb7c1feb2e53282089ba253707ffc13f3fd2ecdfda8d9b3f48190c277321a642b853d4e9a738663f SHA512 561b5321846876478043da2ea5bfbf00a7c24f7fb2d0afb7420219084d5bc937ea686a627f4e388023c3ce640fc20ec345e5053b00d323ef264eff3c893eac84
-EBUILD pulseeffects-9999.ebuild 1489 BLAKE2B e2dbfba8c9a3649c53613eb1a959f9365f29aac5e58366f5dfe66a36cb9553a4b28605877d8d8d43ac4601ea1d3536119f2c147b1d6ead15a9083d61b9871db2 SHA512 eaa015266a0b4678e2893ba480f9ffee7f859545378875f144f341d733382f20f857acd7f6a26273b90b2ee53fe61828c4168a2cc6a32ed1b1717835496f8f97
+EBUILD pulseeffects-3.2.0.ebuild 1521 BLAKE2B bf6b2765bc7f35a774bc81c93a4554439fa0f46c914a8aaca8d8e9a352aa180fec2565f617113da8b6e8199753017812a289fa967b332b7d2bacd97ebb75391b SHA512 04c6f8ec7a4ddcbfe4ad4184f759790987efcc15e105f486ca7ec74cabca5a92514af0dff4f041cf9e196b92f615a2df2827a8fe4bf6deb4f0270e006a1c023f
+EBUILD pulseeffects-9999.ebuild 1534 BLAKE2B 826872e04679ab3775eaf0ae09b035e756032d78f1d02c42b95216f02ff3dc374e190180e547b815dac2dee102bd201f5374a2bcd8f0f37868e7100fcbe12b7a SHA512 98a051fe82f45160b1bba24bf950765de2a6438acb927d9218ecd6167548a4d1f0c716ff450da9ae726bc32ac092b276b47a17b90422bcaaaf33e6d6496bf5d5
 MISC metadata.xml 607 BLAKE2B b9f1bd8b2afd83f2e07b1d5a3c1a82fd1ff7de67182316d868890375b1144edf292181c702fa274da87bd0cc43a5e967ed6f379d0e85764a31834a4ddb3c8c8e SHA512 fa5780c3149aad1d3c5edf76356d521942a85271576f868598c54a7010cf3d31366ad08aa80402479addf8f69111973e7e814abc2df17ea7d0273a5e2a749ac2
diff --git a/media-sound/pulseeffects/pulseeffects-3.2.0.ebuild b/media-sound/pulseeffects/pulseeffects-3.2.0.ebuild
new file mode 100644
index 000000000000..5913eede3e2a
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-3.2.0.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-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-bs2b-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 a339c9081fb9..58b637a0b4d7 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.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
@@ -40,6 +40,7 @@ DEPEND="
 	>=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
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index f2d85112576a..4caa11363958 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,7 +1,9 @@
 DIST quodlibet-3.7.1.tar.gz 3651908 BLAKE2B dd221aae3af83e7f7b1c535c5294a5262b8b08bb7ac068078fb3be1b1c6a3a8770dda20b6a03b3fd998bac17f1087b748d5fd1fe3b7f010ee107283b2170b452 SHA512 73f2a909e29178fb4074dbf451a6d04170aebecb7934248b04b909f9639c9098054eefe3343cfb67cc3c622f6d453b5417e5233d4d2ec9c87c48a0c5b4debf4f
 DIST quodlibet-3.8.1.tar.gz 3697363 BLAKE2B 67c56281a998d93b2ea457656473ab7fc45a1d4d80aa561fc1946e129ac91a01c65fdb34bd314b5742756708714ac043341cae6ee38e93e37a7a16e3bf481c20 SHA512 5f8f7ba3157dea83782c64989114ad38295c660300284b72e825eba46eae053120c96e60518d573b4010dd49e396a4fe8d04788e632e61e38fa6edd953014275
 DIST quodlibet-3.9.1.tar.gz 3850929 BLAKE2B c4317521259f1d46e927276ee8bd927afd72708f7b6e260a68e2cfe6e949f44e08df5884f3613804955b18b7284f0140f9d2d409833bd0a139732728903ae978 SHA512 6d6b6380de2fc2d3ab1614b304f2d7219ff1d823e03f532baa0e9b1308fd36094ad745433494253d956182ae9914eb62846df3d3e5fea92dddccdaa725178563
+DIST quodlibet-4.0.2.tar.gz 4730188 BLAKE2B abe5cdbb6302bf381a7426145c25f6c1e205a2be8ffd801b93ed47e0a23764c142b59cd8de001458ef378fe70523308035517b82bfacbc1213eb7f4a86dcdb7d SHA512 c8c1f823ace03f69fab848f8e312edf9aa1e1e417a843ad2e08d75a0e26a0e095b7050e737be450e5b0b72c7c51b16d1d2143e297dde67bae310b9cdb6f85e3b
 EBUILD quodlibet-3.7.1.ebuild 1673 BLAKE2B 95ff784ef3739dd4f2a11d030af79ce32eb1037730dbda30eb4130304682401141d2632241e33eaa2fa72937190b76e1de78944280123c02824d04959ede06cd SHA512 9c31b63c2387b8b3f57515b5d6e35127f488af5c2308bf9470fa649ecf3819c8a4a391f8cd6c3148a5fd72685bab1f88ba86359881d380dde0f1dbbc458383f1
 EBUILD quodlibet-3.8.1-r1.ebuild 1726 BLAKE2B f713a0edf937ee70567d2ab9dcaf90c138c94e1345d6037ea51620332b4e902aaf0c8ebe674c5b62dc10d3a9b70338f4883f82fdd7900631057a5a27ed2837cc SHA512 96f66cf45c75e536b9ddd55c81baf932e9dd58c356eea676a4011032eedd3456b1a1ea226f36df5137db1cb31ac95d1a9bccb6ab7bf6aef2b23c383ba604544d
 EBUILD quodlibet-3.9.1.ebuild 1776 BLAKE2B ea30c039fb930d1480943d3e3311318bbc615489833615dacdb20076df7c2ad9d934af518f90b19d7f925cc0e40b2c801ecc12b7fab116bf6e5282be33812f40 SHA512 f80e1e31c053d01dae188726ff2100a2c819e2108119e88374ecd1cee2dc5cda3cb4756f59ad8f442ca0dbcce44394f6c456a37bee84ccfbcea9bed46f869941
+EBUILD quodlibet-4.0.2.ebuild 1611 BLAKE2B d1a37f206b0bc5014bdf3da1e361006c03916ad9fc6763a330651a4c44eebf45ad1dd0b406b92f4638f019e6f60293dec1440f63b8afe573c48e90100cbef8f3 SHA512 1caf57d3f99aae71e015db3ed126265e08b9a5a19bc4adbf86028a7e27cfe9c64a1fd3c4db18ec1f40258e2b405cb68f3e049aeae858ea95a908bc8797697644
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-4.0.2.ebuild b/media-sound/quodlibet/quodlibet-4.0.2.ebuild
new file mode 100644
index 000000000000..a6d06fe5a038
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-4.0.2.ebuild
@@ -0,0 +1,69 @@
+# 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 distutils-r1 gnome2-utils xdg-utils
+
+DESCRIPTION="audio library tagger, manager, and player for GTK+"
+HOMEPAGE="http://quodlibet.readthedocs.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+dbus gstreamer +udev"
+
+RDEPEND="dev-libs/keybinder:3[introspection]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.32[${PYTHON_USEDEP}]
+	net-libs/libsoup[introspection]
+	x11-libs/gtk+[introspection]
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-meta:1.0
+		)
+	!gstreamer? ( media-libs/xine-lib )
+	dbus? (
+		app-misc/media-player-info
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		)
+	udev? ( virtual/udev )
+	!media-plugins/quodlibet-plugins"
+DEPEND="dev-util/intltool"
+
+S="${WORKDIR}/${PN}-release-${PV}/${PN}"
+
+src_prepare() {
+	local qlconfig=${PN}/config.py
+
+	if ! use gstreamer; then
+		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
+	fi
+
+	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc NEWS README
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg-utils_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg-utils_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
new file mode 100644
index 000000000000..d71c57294c93
--- /dev/null
+++ b/media-sound/sc2mpd/Manifest
@@ -0,0 +1,12 @@
+AUX ohnet.makefile.patch 1233 BLAKE2B 1a877c58ec3b37c96dd4ea3830159de8bc3c34cd99223881baf73792569301a3eb82ce5c51e2c943773a4b2a491affa9228994e05d358a674a313b6fe3f14d3f SHA512 d2b99fa95403139a2b79ac4eacd0a1a8581c1a72271a6ae15fa7c3a241ebe58cccdf6a85bba602ace9f572c217f5bf1f01b95a12ad4395b42d4738243dee1b89
+AUX ohnet.optionparser.patch 449 BLAKE2B 55133d193ebb7dc249f71ad8d249b22569c03456e0ad687e3af27e88ed0502e134b8e70128cae4fe1d92b503e52f94c8d567159fca9ff6133f99b25c791044f9 SHA512 fe723ee9f734b5ae3a5d1a2ee3c0cb22b887d154314cc776253d14adff20de86d51a8563ba1dfb2b0f37a9c77e24277d961c45941e23a644f2769a17d050d665
+AUX ohnetgenerated.commonmk.patch 1473 BLAKE2B 6d2d8497fcd7e4e9e0f2210fc24308eab4559f8974f3e6f2d6e39163a54fb7b848455d496b0191e7260c83dc27bdb96e0f1bcbaa124165b3de603b22e5adabea SHA512 a9b6b8e2d23ca661c7590fb55c34b02a248fb4b95b843e4d87fd11ec08b360fcc386d7738fd3a6433bec22cdaaa81932b81342c19d99ac5673dcfb6c29215c9f
+AUX ohnetgenerated.makefile.patch 1138 BLAKE2B a65ff04a64c64ad86625f635990615271a206cb4657fb7eef423a0b04d1718b113eaab0aa57b1b52f7235ec8a1f41dcd6a8f2e949ae45336dd1c55380a19f791 SHA512 4bcd0e5044fd89a51a9be29f2f445f59292a8b36a249f09a74aa9a7ff215b6359be8a526e1ddf9b1c7fab56f6e2453afe5841b543552fe3abf78ce5c84b25e9c
+DIST ohdevtools.d35861.tar.gz 1187475 BLAKE2B 82138d9b64f3172d540402e99b716e9b56bde2133b2565b442bfe6ae6b0e2235226027c4b43b17e3eb005b6f52a4d6a278e0895d267222a63f910ea556e4d76c SHA512 25188c3ae837db12e5c7f349ab01a315f8c68909e3eaa530dc9ba09fb2bcb3cd0a671676b3dd4902ef019b7e331d2acac0978649bce29df585e54d13158ff162
+DIST ohnet.1dd641.tar.gz 20831753 BLAKE2B 82724b7f2cd5cd0dcaa54786394a2560b965f5f16df7bb84037795f1334b8052a4cfeff8f5f39bdc5d7a0ccb2093190c38de987957463d10cac407d9694a6a92 SHA512 67ccdbee6d909df30acb7c89aeba75d3accdbb533dda5abc02c66f867e2fad9a360696d5e28dd1decdc575a1396d026824329450e85e3a3b3e4f7af2e144140a
+DIST ohnetgenerated.e3edb9.tar.gz 1887473 BLAKE2B 1b878dd743f0b45f69c3eb018ddbd64db60285ee8743bb039f9a794a9e0ecdb516e1138ac622fc7cde3462fe5c3cfc006d71d0b22048496c1bc190cc4f34a906 SHA512 9b48d0ff496acfa4313c1efc90e73f1050fee011b1ab301b9268ba4009fca9a47978cbe2f1f0a1d05d7c939f95b4a38560b9f63464305032c20d36af3ade8811
+DIST ohsongcast.3299ea.tar.gz 831313 BLAKE2B aaa5590af288bbf2b358bad613b983418f6648219bba046113a8c712f3a369fee2894c8aa42f96ead16582b96b982d1696b478950e0e3d0ef6c8e3325e5a3214 SHA512 ac1e81166e5b73a943f78c930ef89fc5b71447c7eb8c4cc509c50c686a360a25f75f1651061a653bf995c15377bee4cb98a97665bf27f04f947940a249e12661
+DIST ohtopology.cc09c0.tar.gz 118703 BLAKE2B ef5b560cb2a272586e8755117b5021d67562bda962b0c6240072ad42876ae71f21c81611521d31b01212d2175637244b8513332858aec3d7e713546587111ed0 SHA512 46f1e4ba6b7553b81c939c2ae691ab89e0bf9b565820e8c65b14b6534f3a9240580cb9fd69f46568c5f0c8d105da825b6f9abbf61a64289a4f553a47902b38d4
+DIST sc2mpd-1.1.4.tar.gz 218128 BLAKE2B 71ff5e95d868c40d5c9fc72d65161d97ccc1ed366e7465c038efb646bb4ab581d24dbab7280fb739029bbaec7ff8f5804006a4cdc8a61ad0395acb9da74db95c SHA512 eebd21198ec2a9b0e1122a9b3316eaefd38daa2e6b6aa4c480e8c1fef0a8600a68c386d1957b4cf9203a61bcc63b7842e145073092f30ec2e81cdf1010e9f1ad
+EBUILD sc2mpd-1.1.4.ebuild 4566 BLAKE2B 7bf45b49fbeb40a971898568a8a704605bce5c500997ce7d24d0fb22a5a299af9fedf271565e2ee20bd01fc8104f6404ee906ccf977cbec1704ce15f19757bad SHA512 a38646d513b604ea0237be131adf7992603090e1cdfa12e4f715b2239a73d7d06440a0ecbfe7622e8a6475eb0df3921dc7f227a977a265398d514bc401be5a6d
+MISC metadata.xml 313 BLAKE2B 81be81a3249c77371bf3c159e69a7151fd4763449f1b32cb02de42e774e4e050b45197e0a22dd294b3f9f116c680d18e18c03437bc571952b6739a01f5b04180 SHA512 993a3648e52c72afc8cceb7cf87a3bbf28658f106ca0b12c2e90f098e8d02b6d73f6e1ff728aef86715daae17533a17e6495d8110c59f91e116e84587ef5eddc
diff --git a/media-sound/sc2mpd/files/ohnet.makefile.patch b/media-sound/sc2mpd/files/ohnet.makefile.patch
new file mode 100644
index 000000000000..29a29bcc9bb5
--- /dev/null
+++ b/media-sound/sc2mpd/files/ohnet.makefile.patch
@@ -0,0 +1,35 @@
+diff --git a/Makefile b/Makefile
+index 29f2d6a..038b05e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -82,12 +82,19 @@ else
+     ifneq (,$(findstring arm,$(gcc_machine)))
+         ifneq (,$(findstring linux-gnueabihf,$(gcc_machine)))
+             detected_openhome_architecture = armhf
++        else ifneq (,$(findstring armv7hl,$(gcc_machine)))
++            # cubox: armv7hl-redhat-linux-gnueabi
++            detected_openhome_architecture = armhf
+         else ifeq (${detected_openhome_system},Qnap)
+             detected_openhome_architecture = x19
+         else
+             detected_openhome_architecture = armel
+         endif
+     endif
++    ifneq (,$(findstring aarch64,$(gcc_machine)))
++      # odroid64: aarch64-linux-gnu
++      detected_openhome_architecture = arm64
++    endif
+     ifneq (,$(findstring i686,$(gcc_machine)))
+       detected_openhome_architecture = x86
+     endif
+@@ -375,6 +382,10 @@ mkdir = mkdir -p
+ rmdir = rm -rf
+ uset4 = no
+ 
++# This avoids errors in Generated/Devices.mak (they apparently have no
++# consequences anyway because we use make native_only=yes)
++t4 = echo
++
+ ifeq ($(managed_only), yes)
+ build_targets_base = make_obj_dir ohNet.net.dll CpProxyDotNetAssemblies DvDeviceDotNetAssemblies
+ else
diff --git a/media-sound/sc2mpd/files/ohnet.optionparser.patch b/media-sound/sc2mpd/files/ohnet.optionparser.patch
new file mode 100644
index 000000000000..a31657684271
--- /dev/null
+++ b/media-sound/sc2mpd/files/ohnet.optionparser.patch
@@ -0,0 +1,12 @@
+diff --git a/OpenHome/TestFramework/OptionParser.cpp b/OpenHome/TestFramework/OptionParser.cpp
+index fe90233..644fc0b 100644
+--- a/OpenHome/TestFramework/OptionParser.cpp
++++ b/OpenHome/TestFramework/OptionParser.cpp
+@@ -282,6 +282,6 @@ void OptionParser::SetUsage(const TChar* aUsage)
+ {
+     delete iUsage;
+     iUsage = NULL;
+-    iUsage = new TChar[strlen(iUsage)];
++    iUsage = new TChar[strlen(aUsage)];
+     (void)strcpy(iUsage, aUsage);
+ }
diff --git a/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch b/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch
new file mode 100644
index 000000000000..a4f28f9a7009
--- /dev/null
+++ b/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch
@@ -0,0 +1,24 @@
+diff -u ./Common.mak ../../openhome/ohNetGenerated/Common.mak
+--- ./Common.mak	2017-09-19 10:51:13.000000000 +0200
++++ ./Common.mak	2017-09-19 13:21:25.984071432 +0200
+@@ -17,20 +17,6 @@
+ $(objdir)ohnet-generated.jar : CpProxyJavaClasses DvDeviceJavaClasses
+ 	$(jar) $(jarflags) $(objdir)ohnet-generated.jar -C $(objdir) org
+ 
+-Generated$(dirsep)GenerateSourceFiles.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/UpnpMakeT4.tt
+-	$(mkdir) Generated
+-	$(t4) -o Generated$(dirsep)GenerateSourceFiles.mak OpenHome/Net/T4/Templates/UpnpMakeT4.tt -a xml:OpenHome/Net/Service/Services.xml
+-	@echo Attention: a makefile has been re-generated.
+-
+-Generated$(dirsep)Proxies.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/CpUpnpMakeProxies.tt
+-	$(mkdir) Generated
+-	$(t4) -o Generated$(dirsep)Proxies.mak OpenHome/Net/T4/Templates/CpUpnpMakeProxies.tt -a xml:OpenHome/Net/Service/Services.xml
+-	@echo Attention: a makefile has been re-generated.
+-
+-Generated$(dirsep)Devices.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/DvUpnpMakeDevices.tt
+-	$(mkdir) Generated
+-	$(t4) -o Generated$(dirsep)Devices.mak OpenHome/Net/T4/Templates/DvUpnpMakeDevices.tt -a xml:OpenHome/Net/Service/Services.xml
+-	@echo Attention: a makefile has been re-generated.
+ 
+ native_targets = make_obj_dir copy_build_includes proxies devices
+ 
diff --git a/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch b/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch
new file mode 100644
index 000000000000..d320cefbd473
--- /dev/null
+++ b/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch
@@ -0,0 +1,30 @@
+diff --git a/Makefile b/Makefile
+index bf7a1ba..49bffaf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -70,14 +70,17 @@ else
+     else ifneq (,$(findstring linux,$(gcc_machine)))
+       detected_openhome_system = Linux
+     endif
+-    ifeq ($(gcc_machine),arm-none-linux-gnueabi)
+-      detected_openhome_architecture = armel
+-    endif
+-    ifeq ($(gcc_machine),arm-linux-gnueabi)
+-      detected_openhome_architecture = armel
+-    endif
+-    ifeq ($(gcc_machine),arm-linux-gnueabihf)
+-      detected_openhome_architecture = armhf
++    ifneq (,$(findstring arm,$(gcc_machine)))
++        ifneq (,$(findstring linux-gnueabihf,$(gcc_machine)))
++            detected_openhome_architecture = armhf
++        else ifneq (,$(findstring armv7hl,$(gcc_machine)))
++            # cubox: armv7hl-redhat-linux-gnueabi
++            detected_openhome_architecture = armhf
++        else ifeq (${detected_openhome_system},Qnap)
++            detected_openhome_architecture = x19
++        else
++            detected_openhome_architecture = armel
++        endif
+     endif
+     ifneq (,$(findstring i686,$(gcc_machine)))
+       detected_openhome_architecture = x86
diff --git a/media-sound/sc2mpd/metadata.xml b/media-sound/sc2mpd/metadata.xml
new file mode 100644
index 000000000000..6d9ed9356fb5
--- /dev/null
+++ b/media-sound/sc2mpd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>stasibear@gentoo.org</email>
+</maintainer>
+<longdescription>Implements the SongCast protocol for use by upmpdcli and mpd</longdescription>
+</pkgmetadata>
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.4.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.4.ebuild
new file mode 100644
index 000000000000..90ecdf9ac79c
--- /dev/null
+++ b/media-sound/sc2mpd/sc2mpd-1.1.4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
+
+sha_net="1dd6411ffbe59fe09517162fb88e2405adb4990f"
+sha_netgenerated="e3edb912410d4c5a4d5323bb1e9c27660a42d78f"
+sha_topology="cc09c09da4be8d3d04adae5b8f0daaf8450906a3"
+sha_songcast="3299eaedfea34993b79e6d30444792d4fb12a110"
+sha_devtools="d3586187dfa5f0a8b0f3e35e3d1dc50d1c34943d"
+
+SRC_URI="
+	https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz
+	https://codeload.github.com/openhome/ohNet/tar.gz/${sha_net}
+		-> ohnet.${sha_net:0:6}.tar.gz
+	https://codeload.github.com/openhome/ohNetGenerated/tar.gz/${sha_netgenerated}
+		-> ohnetgenerated.${sha_netgenerated:0:6}.tar.gz
+	https://codeload.github.com/openhome/ohTopology/tar.gz/${sha_topology}
+		-> ohtopology.${sha_topology:0:6}.tar.gz
+	https://codeload.github.com/openhome/ohSongcast/tar.gz/${sha_songcast}
+		-> ohsongcast.${sha_songcast:0:6}.tar.gz
+	https://codeload.github.com/openhome/ohdevtools/tar.gz/${sha_devtools}
+		-> ohdevtools.${sha_devtools:0:6}.tar.gz
+"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	media-libs/alsa-lib
+	media-libs/libsamplerate
+	net-libs/libmicrohttpd
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cd "${WORKDIR}" || die "Couldn't cd to WORKDIR"
+	mkdir openhome || die "Couldn't mkdir openhome"
+	mv ohNet-${sha_net} openhome/ohNet || die "Couldn't mv ohNet"
+	mv ohNetGenerated-${sha_netgenerated} openhome/ohNetGenerated || die "Couldn't mv ohNetGenerated"
+	mv ohdevtools-${sha_devtools} openhome/ohdevtools || die "Couldn't mv ohdevtools"
+	mv ohTopology-${sha_topology} openhome/ohTopology || die "Couldn't mv ohTopology"
+	mv ohSongcast-${sha_songcast} openhome/ohSongcast || die "Couldn't mv ohSongcast"
+
+	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
+	epatch "${FILESDIR}/ohnet.makefile.patch"
+	epatch "${FILESDIR}/ohnet.optionparser.patch"
+	sed -i -e 's/ bundle-after-build//' UserTargets.mak || die "Couldn't patch UserTargets.mak"
+
+	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
+	epatch "${FILESDIR}/ohnetgenerated.makefile.patch"
+	epatch "${FILESDIR}/ohnetgenerated.commonmk.patch"
+	sed -i -e 's/ bundle-after-build//' UserTargets.mak \
+		|| die "Couldn't patch generated UserTargets.mak"
+
+	eapply_user
+}
+
+src_configure() {
+	econf "--with-openhome=${WORKDIR}/openhome"
+}
+
+src_compile() {
+	# Begin ohbuild.sh reverse engineer
+
+	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
+	make native_only=yes || die "ohnet make failed"
+
+	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
+	# TODO: get from environment/make target
+	deps="${WORKDIR}/openhome/ohNetGenerated/dependencies/Linux-x64/ohNet-Linux-x64-Release"
+	mkdir -p $deps/{include/ohnet,lib/{ohnet,t4,ui,PyOhNet}} || die "Couldn't mkdir deps"
+	cd $deps || die "Couldn't cd to deps dir"
+
+	ohnet="${WORKDIR}/openhome/ohNet"
+	find "$ohnet/Build" \( -name '*.a' -o -name '*.so' \) \
+		 -exec cp '{}' lib ';' \
+		|| die "Couldn't cp binary libs"
+
+	cd "$ohnet/Build/Include" || die "Couldn't cd to include"
+	cp -R * "${deps}/include/ohnet" || die "Couldn't cp include"
+	# cd "$ohnet/Build/Tools" || die "Couldn't cd to tools"
+	# cp -R * "${deps}/lib/t4" || die "Couldn't cp tools"
+	cd "$ohnet/OpenHome/Net/T4/Templates" || die "Couldn't cd to templates"
+	cp -R * "${deps}/lib/t4" || die "Couldn't cp templates"
+	cd "$ohnet/OpenHome/Net/Bindings/Js/ControlPoint" || die "Couldn't cd to ui"
+	cp -R * "${deps}/lib/ui" || die "Couldn't cp ui"
+	cd "$ohnet/OpenHome/Net/Bindings/Python/PyOhNet" || die "Couldn't cd to py"
+	cp -R * "${deps}/lib/PyOhNet" || die "Couldn't cp py"
+
+	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd later to ohNetGenerated dir"
+	make native_only=yes || die "ohnetgenerated make failed"
+
+	cd "Build/Include" || die "Couldn't cd later to include"
+	cp -R * "$ohnet/Build/Include" || die "Couldn't cp generated includes"
+
+	cd "${WORKDIR}/openhome/ohTopology" || die "Couldn't cd to ohTopology dir"
+	mkdir -p build/Include/OpenHome/Av || die "Couldn't mkdir av"
+	cp -p OpenHome/Av/*.h build/Include/OpenHome/Av/ || die "Couldn't cp to av"
+
+	cd "${WORKDIR}/openhome/ohSongcast" || die "Couldn't cd to ohSongcast dir"
+	make release=1 Receiver WavSender || die "Failed to build ohSongcast"
+
+	# End ohbuild.sh reverse engineer
+
+	cd "${S}" || die "Failed to cd to source directory"
+	make || die "Failed to make sc2mpd"
+}
diff --git a/media-sound/sndfile-tools/Manifest b/media-sound/sndfile-tools/Manifest
index 663e11ddd9cd..bd8ea8d03498 100644
--- a/media-sound/sndfile-tools/Manifest
+++ b/media-sound/sndfile-tools/Manifest
@@ -2,7 +2,6 @@ AUX sndfile-tools-1.03-remove-Werror.patch 660 BLAKE2B 2f85751bff305926e47888b8d
 DIST sndfile-tools-1.03.tar.gz 474494 BLAKE2B 17c8f6782895a5e02bcd39e0e966a9196fe26b8fa192b3375a4f167cb554de168d4ce4e638d792720ee3e74483a88060ef9bf6d3713c91834acc9b39427185e2 SHA512 bc6ac7977a95ccf845c889db81452ae84b4f10a8f51c91ddd6fe4d926337a60cdbcb2859b0758816622554bf26a6e42b70f791f2c5158926c3f92ab2abbf14dc
 DIST sndfile-tools-1.04.tar.bz2 714880 BLAKE2B 14d8f9a8172e4e3d8fe320baf3e546c3998636c0de36e8b41e38e277c18f2af6c3ea944eb4cecdda0e225fa3d7adbcd3a5618e74a9d567c42eb0056f162703e3 SHA512 90b0121f4d0bf3ebf3962cc47bcd6a11e5a644d0567be137a8bcf5881944e03e3c9650c9813c982a58072154f62dd176c46cfe83e5661ff81205db30923b71d3
 EBUILD sndfile-tools-1.03-r1.ebuild 566 BLAKE2B 4ce23c6046c637aba54338e506ee85cf8833d0dea7d462e7f2bc489096ebbd7185fbf08e9a53fb2b3d9a22a62171920367d42c86eb60576ffff76421b47ce6ee SHA512 2608ff60cc47f06c37955cd85c76ebfb698a86cfdf24bad580262a73ee465b187e7bd479760c7a74ec7d7a09694c8fc2f68ddc3fc8c9fa4176099e6b3f459c24
-EBUILD sndfile-tools-1.03.ebuild 648 BLAKE2B 98ce9bcf1a69c4e9f29ca63b9e405ab737f3ce7b9bd2027b1d8f2dfcfe84abfd34372893d112161372424b6cfff8909a880116380cfabcb5b5771ed249357b00 SHA512 deb4e326d087cbae4ce5d1e7c725596321529e5b02cba885eacfee18eb01ca06c11f0dc4d1bac7d372f30a3ff28f63947fdeab1f6d2fb7d9a8dcd64cb3e67765
 EBUILD sndfile-tools-1.04.ebuild 790 BLAKE2B 88cf4dab199359745db0bf7221af87f1ef6f4697546c0e011b9c2f9963ed2735e32275c88559ba38a075c5b7789676018ed808c05ed27d420c9f6a22648f63e3 SHA512 15d27798bd10316f4bd94de55b4e2af78aacf7e622af92ab0a7bd8290b95ab81c0c064d730550b91e7852e0e89dddfa85621eacb36217ef49acc4458eb022c66
 EBUILD sndfile-tools-9999.ebuild 790 BLAKE2B 88cf4dab199359745db0bf7221af87f1ef6f4697546c0e011b9c2f9963ed2735e32275c88559ba38a075c5b7789676018ed808c05ed27d420c9f6a22648f63e3 SHA512 15d27798bd10316f4bd94de55b4e2af78aacf7e622af92ab0a7bd8290b95ab81c0c064d730550b91e7852e0e89dddfa85621eacb36217ef49acc4458eb022c66
 MISC metadata.xml 572 BLAKE2B 473449aba53817e0599e9135148ddf893d438fba7bac2325c923a180c3ef10fb63de920af5e1201117d1130647455e7f57f6e131cffd0ac9d5b82e6750ff014c SHA512 9d91c621d44f3a3bb70ac84f026d746db918ce6ba0c4b6b9b7e2c85811e10f4c7936cbb15368ae1d38bed6a593115ec7a63f6966aae30cc88140c6edf3527ec2
diff --git a/media-sound/sndfile-tools/sndfile-tools-1.03.ebuild b/media-sound/sndfile-tools/sndfile-tools-1.03.ebuild
deleted file mode 100644
index a64ae07e3b29..000000000000
--- a/media-sound/sndfile-tools/sndfile-tools-1.03.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-DESCRIPTION="A small collection of programs that use libsndfile"
-HOMEPAGE="http://www.mega-nerd.com/libsndfile/tools/"
-SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=media-libs/libsndfile-1.0.19
-	>=x11-libs/cairo-1.4.0
-	sci-libs/fftw:3.0
-	media-sound/jack-audio-connection-kit"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-src_configure() {
-	econf --disable-gcc-werror
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
-}
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index e264748a0833..69b08c8f6172 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,5 +1,5 @@
 DIST soundconverter-2.1.6.tar.xz 195864 BLAKE2B 0be5f5df492742745f56ca3ba90faa134c11f802aefad359e1c03852c87be87e2c57afac811d4f17d2c9303d41e905fb0c9a8c9985c179d216a511183118d369 SHA512 d607d4c260f0b8d810f7251f9bbcd02359984dd2a8bf3340be14602e3392362b9a6bc54a9f0c20f16bfee2f971f784a4093f535307dfb2d6087fb4492511a9ba
 DIST soundconverter-3.0.0-beta1.tar.xz 196916 BLAKE2B 82832a151e030cbd2be129fe7f4dcd92430aadc71b163c3800cc2108f502020561e2c74291cbb25050ed42bd9d71fdfe310f107af84f612711554cf3e32fd07b SHA512 a27a2c7b4156a6d6c682424c5fa64a4dd82537b1dbfa8176fa39fbfc4d139a21b7dd042de80d088333c0aef0042a76940ab8da5d9708b6aac3399b32b7408f09
 EBUILD soundconverter-2.1.6.ebuild 1490 BLAKE2B e297e063dc167e5aedeaa72ab06636b905797a7ff0fd94ad6169317e7163fe199a3feed13231c72971c4d8451347691d6acc1d2291319c5a0816c1a1a151d028 SHA512 d74027db98593fcce85fa8a7a5ae965037ef53c5ac238a4f6a4457b87caa291907991badfecc35c3a9fb89d4128b662a3c61e6fa0b268e2b82c34f5e14f5f229
-EBUILD soundconverter-3.0.0_beta1.ebuild 1725 BLAKE2B 6e78f711e603906dac6f455a153be634fafcb759998a18e188b64d4f2b0c98fa7c710e6313d345ff6e318eaa392bf1e0e9ea35c4b4eb99f96943da98aa1c9bf1 SHA512 ef93fd79a20434c910e64fd65a3476b52fb6bca09d91a504e82373e399e1c9bea4ac2b87d57fca2b0568f9944223c7bb08232c08e007bc3a8511d4586fa839a6
+EBUILD soundconverter-3.0.0_beta1.ebuild 1724 BLAKE2B e6a570798939c4570939dc0e8a9c7713e408b67fd7fbd029a3dae023171f991bc1c1311ad4b4c0064a53134507f67e36f98a2244e36469e1b9e8a718be3b0eb3 SHA512 ab6f36f0e7ca2e82dad02e7ce9567df646d17089f9874f3d478cc16d800edc5d7df460fa3f750508404e72d806591f96be3f3a79cb4bcf55ad299cef63d65452
 MISC metadata.xml 422 BLAKE2B c38fb6712043983aeaccb925b572fe26156e10776ff00ff454fd215ddedb0751d3c5f5a973725da4e765907f3c9d0ffe6f4062650a7afa2e092cd9b6930219b2 SHA512 5dc640470aea1b45a59fbc757c1fc57a287a733c7e924cecec2dfda988caf313aa9863e86bc4a538565d9e574207654e62ec2071d03f647d21ef6dff38d15732
diff --git a/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild b/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild
index eaeb1703786d..9e6a1a333528 100644
--- a/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild
+++ b/media-sound/soundconverter/soundconverter-3.0.0_beta1.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
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE="aac flac libnotify mp3 ogg opus vorbis"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-sound/tap-reverbed/Manifest b/media-sound/tap-reverbed/Manifest
index e81d86e52f14..0c9b90a4b15b 100644
--- a/media-sound/tap-reverbed/Manifest
+++ b/media-sound/tap-reverbed/Manifest
@@ -1,5 +1,4 @@
 AUX tap-reverbed-flags.patch 1549 BLAKE2B 710b8a2276cd7ca79623e65f9aecaf80c9856a4cf26730c8891deb6894d4c3a357aed0b7359d3672f80d66e5934c0b75693d4ab45550b995e9e431084e3d6577 SHA512 8bd6781d1dbe61231916f0294557b724532baefcbd04317e7483617482f640bc0b4a05e2b3d2b4062c4fb964347602dcb426df9dae96368f384b84e1970780e8
 DIST tap-reverbed-r0.tar.gz 90703 BLAKE2B 7230220b93a5015be790873dec288149cd7d30253a2f4847bbe5c555328a3fff65195bbf6485be71afb91638fb267a3d6cdf351b6edbff4589044f0fba061df5 SHA512 72b3f1257cf5a7076a35afa92604b8df96051e6727f49b9b01192873e6cb3b21e3daaa9e70796966faa13d2e94b9fdf34cdb41b3e91805dbc9787897a7882cda
 EBUILD tap-reverbed-0-r1.ebuild 956 BLAKE2B 0bdf95350a3dd2d09105b6ffe14ea029a80c8e358507465969c47b600bcd543c41bc2f535c50a726472bad29cd79afc96ce901f003c41252eb663aef17882616 SHA512 9ab24ff89673a090eeb72ef3ef3da925fc10043acef46629637103aad80befd2182326b00df28681cfcd1daa80e524116700f205d2575d50165888ee1fd25301
-EBUILD tap-reverbed-0.ebuild 1073 BLAKE2B b77941b28ae20997a472ac0d84fdb89d858f34c9ed4830b43ee58efe306a53b48bb575020ff7ae29097a2588588cc7798ba2818fda705fdaa4e8d5d4bec19d32 SHA512 3fa3888714d764c30d6999d39d3dda6f59d92791098086ff2678a9189907e62507271859265230d45377ad65ac72305daabf69cfe12ceca97925aaae1f859b8f
 MISC metadata.xml 340 BLAKE2B 46e1eef9a17d36dcfdee59018c25fd271b5bb6f34f76c54803eb009345d1daaa67e2ea8127c43c7a071040e6bd41ca324d6bbcf006fb42b37ff62771a43b9fe5 SHA512 b9c58d0b65d68884a4945054cde9176b0ee6db20ff5d22cac318373c13b9b6b23d5c2cef3cd057ae1b244ec59c00ab1dd3e15f38adb0c577dc48d8aeaa7f722a
diff --git a/media-sound/tap-reverbed/tap-reverbed-0.ebuild b/media-sound/tap-reverbed/tap-reverbed-0.ebuild
deleted file mode 100644
index 4d4235868cc9..000000000000
--- a/media-sound/tap-reverbed/tap-reverbed-0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit autotools eutils
-
-MY_P="${PN}-r0"
-DESCRIPTION="Standalone JACK counterpart of LADSPA plugin TAP Reverberator"
-HOMEPAGE="http://tap-plugins.sourceforge.net/reverbed.html"
-SRC_URI="mirror://sourceforge/tap-plugins/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="media-libs/ladspa-sdk
-	media-plugins/tap-plugins
-	x11-libs/gtk+:2
-	media-sound/jack-audio-connection-kit"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-flags.patch"
-	eautoreconf
-}
-
-src_install() {
-	einstall
-
-	dodoc README AUTHORS
-	insinto /usr/share/tap-reverbed
-	insopts -m0644
-	doins src/\.reverbed
-}
-
-pkg_postinst() {
-	elog "TAP Reverb Editor expects the configuration file '.reverbed'"
-	elog "to be in the user's home directory.	The default '.reverbed'"
-	elog "file can be found in the /usr/share/tap-reverbed directory"
-	elog "and should be manually copied to the user's directory."
-}
diff --git a/media-sound/teamspeak-client-bin/Manifest b/media-sound/teamspeak-client-bin/Manifest
index ec153b1b68ab..013e5b497e21 100644
--- a/media-sound/teamspeak-client-bin/Manifest
+++ b/media-sound/teamspeak-client-bin/Manifest
@@ -2,4 +2,4 @@ AUX teamspeak3 258 BLAKE2B a70cae413c2392b601f69f9ab4196c06b711beb35822be9cb9621
 DIST TeamSpeak3-Client-linux_amd64-3.0.19.4.run 37054436 BLAKE2B 719b39102c0a6d4c932db83c502eae6dece7530c39b16b7c453b8e34a97fb0371a9de84fd12242f5f3920c135aefaed75fd8e0e28bf960a9a0d598d6b1e74e8b SHA512 fca7303a9c75bbab4945c9336c78115b28b3f14b278ffccb8453d7b29eabf1cd7147697bf0042bc625a9108db653468e8f0ebc4b29cf00d48f5438c919efa8c7
 DIST TeamSpeak3-Client-linux_x86-3.0.19.4.run 36627204 BLAKE2B b31ec9a0667057538bc428b4735cfddb041492bce797294af33a483c2b04dd8fb8a65277e5296dec6620189221b37728e088101c4d220ba843806ebec5efcc5f SHA512 ec52a78e5753716ba81602ecd60a2440a08ec4fc777d7d560dd714ae4b80fe7befceb5271c11d2eae46dbc3cbf71f0eca4976a44510bc66a51f5ebe39745d2db
 EBUILD teamspeak-client-bin-3.0.19.4-r1.ebuild 1945 BLAKE2B 93dab215db0ae62b337f2c791823700339148225f56a1c392c3d7a8691e0d13f1cf8404d7f14b2536635d3bf9d3f52ebf13248335636df39e6ee58ef695fec6d SHA512 54eecf310eaf2c69d0c9bb490bad60ebdac78d426446372d47690218c8d56dab71abe12381465b0de23ae0250baffd185bee1cf73734315c086f894710093c63
-MISC metadata.xml 708 BLAKE2B 5e7cd83c58319706e57b6d40b7f69fa5ee3c9c28b5ba56078c50b1cb1da50578539286838e0501d176bf686d7a14612a07383ddff3a5afaf15079ac685ccfd9f SHA512 192cb133ecea4239ed304883cf71d6328b5926db9d9a513ad0cdb049205195f20fd480ba1228a7990ae26cd5761a3c36e39ce358f30456aa137d1247435ddd9b
+MISC metadata.xml 572 BLAKE2B 635a2b60377ff14ec73aded043500d6a6eab2a80a6baefa294bb484e905f441ddf8c6129a7ff6f76d68544df3809c9d47bb6e681660caead4da54dce4d841222 SHA512 a3a25bc704faf96f49bec84068b9b8f25895c2dcab5df6324936f788534258fb1c90c5b571ed3b2b161e720cb6be374e4a3fd3058a0e63dd84fc96fe219c5cff
diff --git a/media-sound/teamspeak-client-bin/metadata.xml b/media-sound/teamspeak-client-bin/metadata.xml
index 797f525b2757..be0dbf94ebde 100644
--- a/media-sound/teamspeak-client-bin/metadata.xml
+++ b/media-sound/teamspeak-client-bin/metadata.xml
@@ -4,12 +4,10 @@
   <maintainer type="person">
     <email>gentoo@karolherbst.de</email>
     <name>Karol Herbst</name>
-    <description>Proxy-Maintainer. Assign bugs to him</description>
   </maintainer>
   <maintainer type="person">
     <email>dryatu@gmail.com</email>
     <name>Sami Loone</name>
-    <description>Proxy-Maintainer. Assign bugs to him</description>
   </maintainer>
   <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
index 66ce21c08adb..49e2e5b4a8f8 100644
--- a/media-sound/teamspeak-server-bin/Manifest
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -10,4 +10,4 @@ DIST teamspeak3-server_linux_x86-3.0.13.6.tar.bz2 6367104 BLAKE2B eeeefe664018e6
 DIST teamspeak3-server_linux_x86-3.0.13.8.tar.bz2 6772664 BLAKE2B bde804a069a2700981656860f10d70a45511793370c978c0fc0c3926f039df367d61536657db987c6cc57e8aef543210527e9ff6e8316a5e78319dbd2f874c56 SHA512 7ef5d5d0fa2a1244011c2a68662481e4859aa1660e967b203a508497a4fd3c54db44a9f33116ed4932745942df4b5e4c646658346f288ce6191e3e5629d9638f
 EBUILD teamspeak-server-bin-3.0.13.6.ebuild 2589 BLAKE2B ed81f294c9f15a6d58bc29bdca432a1bcfd72bec8b84c7df524a4116a458f32ee390552be00714346c5e8396a124e028ac98e03b87c3185cbd80af2a806771e9 SHA512 52c6c4cd6eab65c1354887024e45875e975effbe003a60b49c21b101df7abc90ada71984f8000af4221b897a71734fb8274a392527e555245d715c6d972224f0
 EBUILD teamspeak-server-bin-3.0.13.8.ebuild 2589 BLAKE2B f66cd00c651ca5c000b64fbcb5a2b9ae30039455789eeeb6b14a7ce2cb54f3af66f7812a008b4a0269aab6acaa3c1e684255fdefe06be752e7a808efff4c723f SHA512 26688cca026f2d9aa6c5bad4bb540b4f0bf85ca267c3a67e6d702d9e73a8d227b86c68a6bdda966ca4aea9025c99ad09bbfd280bd2e6dc866a9ee3cd0912f35c
-MISC metadata.xml 589 BLAKE2B 86e4615f94e4bc86cc29253ec3d83e639efccac47e2533f035dec4b544027f231e8f3b55b7700f8da101af07f872867b11717d24ba08c753ebc0e5e06ad015fd SHA512 ab4a822863d5003cd578f37c0c3d5d40df49bdbdfb7384353ca9090e79279fc0f941438528081d626aedcd1f0357000ef615d49e674a1bae6d241db8ee1aedf6
+MISC metadata.xml 523 BLAKE2B 633c679661b79b125ca2c0fbdb0ba66ad96e62e66dc2d7e68b75ac800568d2fa1b495385ca4eaf0a0209e6afbec59c90bc3490eea2964c28c6d6df035c6204dc SHA512 c3a7d1accdf12312319f7cf573dc82454b3ffa5201e3c243abcb1f582267f0523e250954cd4894954bcd729d272d0f10af6bf76a73aa421c3fc6a9d438a4d897
diff --git a/media-sound/teamspeak-server-bin/metadata.xml b/media-sound/teamspeak-server-bin/metadata.xml
index d7b0d764fc26..bde7c6989faf 100644
--- a/media-sound/teamspeak-server-bin/metadata.xml
+++ b/media-sound/teamspeak-server-bin/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>ck+gentoo@bl4ckb0x.de</email>
 		<name>Conrad Kostecki</name>
-		<description>Proxy maintainer, assign bugs to him</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index 58f03326960c..32528b15501e 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -6,4 +6,4 @@ DIST umurmur-0.2.16a.tar.gz 91187 BLAKE2B ba306dfa4c6fa958735ab02bd262729d582acd
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
 EBUILD umurmur-0.2.16a-r1.ebuild 2135 BLAKE2B 64d386001a81128c5aab66a35bf3b22b0f15b52f79838094e875ff86594f699ff9f35b52477c1d50dd0b0299b3eba0f50d8ae6a93039aa599f105f18fe34c2ec SHA512 33849901fc0e7d8dcf7592e95be1f73a5309c8dcd98d07340d48c37889cec1b5759616f6de5591ad5a5c94450fd71512f796a44ca20b5188e5d4a9b0f19aefc4
 EBUILD umurmur-0.2.17-r1.ebuild 2162 BLAKE2B 369aaefb129136e11ed135e4d521ef9056ecba8528c441d3f25d88952dc1b5999a7d135759765aa62b1f59b9e1b995e0e2399b33fbfede89cd3f2fe0e2321e71 SHA512 d48f9b896acf82d0fbc727d07ad694d174274f26da4316cb36af623e588df96724cc1e3765a03e647b649466370f34b3bf3bb7a143702a7b96676121aeb6b827
-MISC metadata.xml 1284 BLAKE2B ebdb21e679141ba05441e0e532d982f88744f51d18c7a6b8f57171d61f387fe35f825ce36432bbd01330570e934857c793aee3eabcf6e377f2ea08de304704f2 SHA512 f248722f232774e18e238b0f5ed8692b660f8d111c4db68881afbfac1d1419b28e64a8da97da04b22f2a977b34d144480f1f65cf331a8a9bd249ee4d6addcae5
+MISC metadata.xml 1232 BLAKE2B c4c8e20529e868b6a21a85ea3e29a225c13e292a547a7aa0b178dde2332441e5d19b33614cb04024d25baf6b220b39b8136eef9e46a47d32c5150f6d7f65476a SHA512 24ed9e195f98584b84b01acd4f3fb1cb84415b63f8967f2ac7e47770eafb48585299cdd0f8d742cd086d8d730cd4b16407b9ba9d6c69803b447efa19b6c6c097
diff --git a/media-sound/umurmur/metadata.xml b/media-sound/umurmur/metadata.xml
index 7ea309183ac3..504b76505d66 100644
--- a/media-sound/umurmur/metadata.xml
+++ b/media-sound/umurmur/metadata.xml
@@ -8,7 +8,6 @@
 	<maintainer type="person">
 		<email>alex_y_xu@yahoo.ca</email>
 		<name>Alex Xu</name>
-		<description>Co maintainer, CC bugs</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
new file mode 100644
index 000000000000..e7fcec97feef
--- /dev/null
+++ b/media-sound/upmpdcli/Manifest
@@ -0,0 +1,5 @@
+AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
+AUX upmpdcli.initd 394 BLAKE2B e2b31b58d2f1edb6a490a7244524572cb89062005a47f463c2df857a9a380a541547c65a0de28bc33945f9bb2762390a186adebb5bc36b633af713b54bff3155 SHA512 49dc040957a0af4b6d2b50eb1ee9e41f6b593358a7acd66ee809b06cc775e330757f9952843499f6d1cac6cedcd73b1907a51f31f6721ca9d3fb7719bc496709
+DIST upmpdcli-1.2.15.tar.gz 401551 BLAKE2B 0ec3fd67d67fd039f5b0ac385ad12a78e3c48b0d2530690eb9aaff66bbdbf7ae7229d64cfe753d9e70e75070ee5bc4d0849d11909813f06377981974733134ee SHA512 4a62aced9fa2395752164332c84bf3dedd7b793e7e37638cfe063e887d52b9ce956c866de2aa1cddb7a4dcad97562050f9588aedd59e49e7d427671179f9258a
+EBUILD upmpdcli-1.2.15.ebuild 990 BLAKE2B 671d826f638b7013ac40c94208f6349b1e07267677e77da0c4daa5fa8127d91dccda07fd22a0a6a85e174d1b7d53e51af82c6a410b8f2b68f580cecad7caa703 SHA512 451990bcd180fe710d7016d95636d8532ee781ab28f1517fb119f8639d652a01c4386452bc81e037962d77f934c1fe287fe59ef011c69af6aa693dbb7f8b065b
+MISC metadata.xml 424 BLAKE2B 255b763f479850aab6630f6b5c27eb84ea66692004c85cfafd9ad08edbfa9fe08d745c49f02bc27b126dc883ffc8c22c1d3a248cc94d163b88e8946bdb0d9362 SHA512 283c31f284c8789a0e74d8df0c5324add6875b3eb48a7dd91cb036102bda21465df2ea76656c5015ef050651765fd1fd80f66351deff9d31a2462d1009579ecc
diff --git a/media-sound/upmpdcli/files/upmpdcli.confd b/media-sound/upmpdcli/files/upmpdcli.confd
new file mode 100644
index 000000000000..dce55d70aec0
--- /dev/null
+++ b/media-sound/upmpdcli/files/upmpdcli.confd
@@ -0,0 +1 @@
+config=/etc/upmpdcli.conf
diff --git a/media-sound/upmpdcli/files/upmpdcli.initd b/media-sound/upmpdcli/files/upmpdcli.initd
new file mode 100644
index 000000000000..43618aeca4ea
--- /dev/null
+++ b/media-sound/upmpdcli/files/upmpdcli.initd
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
+pidfile=/var/run/upmpdcli.pid
+command=/usr/bin/upmpdcli
+config="${config:-/etc/upmpdcli.conf}"
+command_args="-c ${config}"
+command_args_background="-D"
+
+depend() {
+    need localmount mpd
+}
diff --git a/media-sound/upmpdcli/metadata.xml b/media-sound/upmpdcli/metadata.xml
new file mode 100644
index 000000000000..8d5234640e01
--- /dev/null
+++ b/media-sound/upmpdcli/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>stasibear@gentoo.org</email>
+</maintainer>
+<longdescription>
+	UPnP Media Renderer front-end for MPD, the Music Player Daemon
+</longdescription>
+<use>
+	<flag name="thirdparty">
+		Enable streaming from Qobuz and Tidal external services
+	</flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/upmpdcli/upmpdcli-1.2.15.ebuild b/media-sound/upmpdcli/upmpdcli-1.2.15.ebuild
new file mode 100644
index 000000000000..d62b00ce8541
--- /dev/null
+++ b/media-sound/upmpdcli/upmpdcli-1.2.15.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
+LICENSE="GPL-2"
+
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="thirdparty"
+
+DEPEND="
+	dev-libs/jsoncpp
+	media-libs/libmpdclient
+	net-libs/libmicrohttpd
+	net-libs/libupnpp
+"
+RDEPEND="
+	${DEPEND}
+	thirdparty? ( dev-python/requests )
+	media-sound/mpd
+"
+
+pkg_setup() {
+	enewuser "${PN}"
+	enewgroup "${PN}"
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
+	einfo "detects sc2mpd at run-time, capabilities are added"
+	einfo "including internet radio support.  See upstream docs"
+	einfo "for more information."
+}
diff --git a/media-sound/wav2json/Manifest b/media-sound/wav2json/Manifest
index c8767a08d41d..b74f4d9598b1 100644
--- a/media-sound/wav2json/Manifest
+++ b/media-sound/wav2json/Manifest
@@ -1,3 +1,3 @@
 DIST wav2json-0.4.tar.gz 742606 BLAKE2B 9a4bb2520bb0a69bfcca8437a77753dae43a4328af93ca48134e0371e69aeb683f6c6cd144d250346e07a9b3f3a445a01ab2de7da16b32a5a12f1959bb5a9d0e SHA512 0bfac4dbd5c2535616fcf09e00914eb06fbf042dab6e69133c9ad6494328ff0bcb849d694499946cc6e8e6ac6dc0f1c68ef462c0a264c93da2c2a7aaea4281a0
 EBUILD wav2json-0.4.ebuild 600 BLAKE2B e42bdcd05f1a04373af4d8534ac95b9ca70aa4abc4e7609af8aa73ddc9d13a9b6b5ee0ad37aa820fcf51fa980b95647aedfc0cc51dbe94b6d44353ea0a0e8de0 SHA512 b3e87fb2ee9a1d7156d0da56659cc150b890e27d42cba0cfbc589ef4f460cedfae644b601433bcac451a204c3a565ebc5702dcd1cfb361342092e2d28836f6a4
-MISC metadata.xml 548 BLAKE2B 2467174d9749c823add6787c7a9959e3f1c4edcfda42ebc2e40c031a3229523483ccd5619a8c5b2a4df5cdae87b28aca3a0c3bdded13f49fdfd3bc2437b6fcbe SHA512 012a5561a943c3c64c2854a2cbc9412eb3e6bb250aa0e083e0889a481a6d806136c9e10e4c41995f9fd485fb704b3388b8cc4bc31810854ecbc589847dabbd3a
+MISC metadata.xml 469 BLAKE2B c21846987cda06400016faba553fc76894662900e77dc10119f0e693e3a47287a1f5513d9731e8c3215b2d945ebe479cc48ce8afd68143be74253754f9936060 SHA512 34afcff42365a507a3ff7079ddfa3d0d8935294313d3a9b12d61fe1813b3ad95fadbf35c3b0c63494ff64350bccf56a8f302036e4611c447c1aa0c92bcee3796
diff --git a/media-sound/wav2json/metadata.xml b/media-sound/wav2json/metadata.xml
index 41e34520996a..a78826423e1b 100644
--- a/media-sound/wav2json/metadata.xml
+++ b/media-sound/wav2json/metadata.xml
@@ -4,7 +4,6 @@
   <maintainer type="person">
     <email>pavel.a.denisov@gmail.com</email>
     <name>Pavel Denisov</name>
-    <description>Proxied maintainer; set to assignee in all bugs</description>
   </maintainer>
   <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
diff --git a/media-sound/xmms2-scrobbler/Manifest b/media-sound/xmms2-scrobbler/Manifest
index 449e0441f58c..39bd6ee5e722 100644
--- a/media-sound/xmms2-scrobbler/Manifest
+++ b/media-sound/xmms2-scrobbler/Manifest
@@ -5,4 +5,4 @@ AUX xmms2-scrobbler-0.4.0-libs.patch 621 BLAKE2B 78ecc5b4bcf8e16607dfed56345ed8c
 AUX xmms2-scrobbler-0.4.0-no-XPTR.patch 618 BLAKE2B 33a3e91cce78e7f9c6c2cff237643b8aae57be6efda47a114c1059211ac66dbfa9d426c90b6b9bab45f27410df5501b32ad148b99344ad59ce6f87389cbbe3af SHA512 24b7e3b0472cfd277ba3bba8f0bd3fd11de43c7c6d3cfb117d142d4950fd820acfafec7df0a3f17889f847437a29521a786441272a59d599986c5d0a6179fe09
 DIST xmms2-scrobbler-0.4.0.tar.gz 19831 BLAKE2B 84194a2359b825c5571637e4d875003262235f8bce550ffeb54a123c53b1aeee49b7fd21c5549903e24348869abba96ba9b7e78cade4dc44dcbb798f4604d8fa SHA512 2df20693479413a18e487f16e87f0a711866221dcbc8f96c970be55aac2c495fcb84e9e3ea754473c747d33d5d1ef54823f6a050d5054581454f956c86f6236b
 EBUILD xmms2-scrobbler-0.4.0.ebuild 1346 BLAKE2B fe184aa1179e54ea8b8ba17a9181796a980e66db0e5b5cca7bd5bb53b9b55f90173718a8e433d9290dad4dabc66e3405e52400fc2f4d6c2df61712adc4f67fae SHA512 f5b5c31346396da50ec9231d4f4e7d51a1001e09df2eae0cf70bff27f41633360c4e2887c1a275fc1c10c07cf27b4a61807804b76252e7b1252001d5b7dd2cf3
-MISC metadata.xml 582 BLAKE2B 4774ae1fe8b6cbbd5a6e50ee7ca4dc649bb9c03569bd942a0eaff075aae6720e8b2a99452d96fcf9827fcb142e9002a54dc71e67a8a80f4937fb2592f7fd6a64 SHA512 1b5c7f9c32c7d7c419d456d38ece8c12597d0b39b13aea8ed289e745a3b6d8c1a6d8b1ab2dbcc4fbd2c18264dba208689421c41470ef9e3cff85a69db6679c02
+MISC metadata.xml 534 BLAKE2B cba02182ace8baaf5933ba4e01464e323ea0c6dc58c575ebea0850808429f45df267c55d4856394885dcb4f8c69763f1c8aacec5ab401b079c8cee893d8e5f61 SHA512 ee2450fc9a95750c4c86c4413ae4b3a560952a6fcee22f5d27f5ac5ff0388deb8e71131a92972e15415cea0f736be554db3c9c607ac374cddfb9b46ba181da76
diff --git a/media-sound/xmms2-scrobbler/metadata.xml b/media-sound/xmms2-scrobbler/metadata.xml
index af872c8a772b..dbb50391915b 100644
--- a/media-sound/xmms2-scrobbler/metadata.xml
+++ b/media-sound/xmms2-scrobbler/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
-		<description>Primary Maintainer</description>
 	</maintainer>
 	<longdescription>
 		XMMS2-Scrobbler is a client for XMMS2 that feeds information about the songs
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 25be52644a0b..3e1c60bd7385 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -23,5 +23,6 @@ DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb70
 DIST xmms2-0.8DrO_o.tar.bz2 1670726 BLAKE2B e226f197b09ebc205fa274d6a0024190e222314bc0df2c6cf443061b3961ca622bd0a1834dfee5c128aa2b003d4e703b5c4976ddc038d84d7f05c3e052060b0b SHA512 478103d80264c0cb32912e828f74d0f5b2f10fe310f530a87ebecda7ca547a69e238cd572788f90bda29494494160d459fa6d1356b4fb87c7a8f0bf02e3b75f8
 EBUILD xmms2-0.8-r4.ebuild 7875 BLAKE2B eb19ec1826e269c446706a1c467f5201b292786672b249d18e7d04c37d1e0c7ebf43f2a25381df7ac170286db5328a83acbdc92d081672ed05d5d3423b8e82f3 SHA512 02272a12bec6a7c65522acf08a9174e34fa80af8ee01c551aa870c370e7c4802946fc56f3d7ef0ee441cf9c9f6ffc34147b4c6dbed8bd60af34b0cc65b68c0cc
 EBUILD xmms2-0.8_p20161122-r1.ebuild 7566 BLAKE2B deca0e3471553bf5d346a9338a3aa0fda6b4a2e23f5966575a5ae1184cb87c2b06fc52869b1d5c8aaddf9aa9211e39c08f2e45e30638cc3d1a0e0ea2abd4057b SHA512 e04abc582528c18a2dd45224280458ea1999be0659ec68b9d7d63938bba1bc513c88a378d72aaf2780d39bf8d98e4f8ddd75d64b135826fab813e750bfe3631e
+EBUILD xmms2-0.8_p20161122-r2.ebuild 7531 BLAKE2B 384cc2e5f938bbe842518c9a520eb357d2eeda24b185fe06cffd6f0e395309cfdea26f3daac2444945b7c740762a2ec569a76278d27c7d1f0907fe53b6d9f7be SHA512 a6163a73800122a6860ad9fd4c4e708ddcbde3555e47b232e88fed81e1f4dabc41e52a046504073b8128a0af5442440b8b00c59eb33cafa9cd823b05f8573b24
 EBUILD xmms2-0.8_p20161122.ebuild 7396 BLAKE2B 7b1eaa463c899ce5d0a2c6cb18e8529b77075cdc205bcc06234f39d74f5ebaf47f06a47f1a35d96031592ae62fb329e8e15aa3861ca522ca1e03e48c74b2fb7f SHA512 7a9c795d826171d5ce9cd24ebe2b385967803a7ca2ee8b7d082c71a5255ded6485f3e6e96c0d4b648d8efdd03f191202296e7990b068dba2b1bb25a0b7bb51c9
-MISC metadata.xml 2667 BLAKE2B 7c5324e6c9ba6f3df5f6a3fb6d7cedb7abf62d1a29684f82843bae821da161230ee4c0292e23e6004f99260485911d5d0365c58e95dd3d5d85357df83fa3876a SHA512 1f096499b2a77e2c07d64d4ad562d316c7687d6d2335b720bcc60bc710d61b3278db331f68c05c3ad400176ca27cf4c7ea0c89886ea0d0ad4a30ee032ab4c996
+MISC metadata.xml 2619 BLAKE2B db882bae1912243670ae3f8a075704ac0398f50a66f0ce990b4283b26b0c99846ea4d491375d9d920b320bb49da9ced1209bcfc86dd341f1e4cbc0a3649bd38d SHA512 f4477bdfc7575b104a7852dfcc789178631c0f0b470a968af7b763c8b7d70ab6cea8a4ff739b3b9adea280838cc5d8cb773337d899b20ecc0797a9d16ef38e97
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
index 4072327e4cf2..551b4bd98e80 100644
--- a/media-sound/xmms2/metadata.xml
+++ b/media-sound/xmms2/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
-		<description>Primary Maintainer</description>
 	</maintainer>
 	<longdescription>
 		It features a client-server model, allowing multiple (even simultaneous!) user
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r2.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r2.ebuild
new file mode 100644
index 000000000000..4471878ba156
--- /dev/null
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r2.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
+
+# generated as 'python2 ./utils/gen-tarball.py' from clean git tree
+MY_P="${P%_p*}DrO_o-949-gca15e830"
+
+DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
+HOMEPAGE="https://xmms2.org/wiki/Main_Page"
+#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2"
+LICENSE="GPL-2 LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+
+IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth gvfs ices
+jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
+perl phonehome pulseaudio python ruby samba +server sid sndfile speex
+test valgrind +vorbis vocoder wavpack xml zeroconf"
+
+RDEPEND="server? (
+		>=dev-db/sqlite-3.3.4
+
+		aac? ( >=media-libs/faad2-2.0 )
+		airplay? ( dev-libs/openssl:0= )
+		alsa? ( media-libs/alsa-lib )
+		ao? ( media-libs/libao )
+		cdda? ( dev-libs/libcdio-paranoia
+			>=media-libs/libdiscid-0.1.1
+			>=media-sound/cdparanoia-3.9.8 )
+		curl? ( >=net-misc/curl-7.15.1 )
+		ffmpeg? ( virtual/ffmpeg )
+		flac? ( media-libs/flac )
+		fluidsynth? ( media-sound/fluidsynth )
+		gvfs? ( gnome-base/gnome-vfs )
+		ices? ( media-libs/libogg
+			media-libs/libshout
+			media-libs/libvorbis )
+		jack? ( virtual/jack )
+		mac? ( media-sound/mac )
+		mms? ( virtual/ffmpeg
+			>=media-libs/libmms-0.3 )
+		modplug? ( media-libs/libmodplug )
+		mad? ( media-libs/libmad )
+		mp3? ( >=media-sound/mpg123-1.5.1 )
+		musepack? ( media-sound/musepack-tools )
+		ofa? ( media-libs/libofa )
+		opus? ( media-libs/opus
+			media-libs/opusfile )
+		pulseaudio? ( media-sound/pulseaudio )
+		samba? ( >=net-fs/samba-4.2 )
+		sid? ( media-sound/sidplay
+			media-libs/resid )
+		sndfile? ( media-libs/libsndfile )
+		speex? ( media-libs/speex
+			media-libs/libogg )
+		vorbis? ( media-libs/libvorbis )
+		vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate )
+		wavpack? ( media-sound/wavpack )
+		xml? ( dev-libs/libxml2 )
+		zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	)
+
+	>=dev-libs/glib-2.12.9
+	cxx? ( >=dev-libs/boost-1.32 )
+	perl? ( >=dev-lang/perl-5.8.8 )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+"
+
+DEPEND="${RDEPEND}
+	dev-lang/python
+	virtual/pkgconfig
+	perl? ( dev-perl/Module-Build
+		virtual/perl-Module-Metadata )
+	python? ( >=dev-python/cython-0.15.1
+		dev-python/pyrex )
+	test? ( dev-util/cunit
+		valgrind? ( dev-util/valgrind ) )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# used both for building xmms2 and
+	# optionally linking client library
+	# against python
+	python-single-r1_pkg_setup
+}
+
+# use_enable() is taken as proto
+# $1 - useflag
+# $2 - xmms2 option/plugin name (equals to $1 if not set)
+
+xmms2_flag() {
+	[[ -z $1 ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
+
+	local UWORD=${2:-$1}
+
+	case $1 in
+		ENABLED)
+			echo ",${UWORD}"
+			;;
+		DISABLED)
+			;;
+		*)
+			use $1 && echo ",${UWORD}"
+			;;
+	esac
+}
+
+src_prepare() {
+	./waf # inflate waf
+	cd .waf* || die
+	# needs port
+	#epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
+	cd "${S}"
+
+	eapply "${FILESDIR}/${PN}"-0.8-ffmpeg2.patch #536232
+
+	eapply "${FILESDIR}/${PN}"-0.8-rtvg.patch #424377
+
+	# required to build tarball from git tree
+	eapply "${FILESDIR}/${P}"-tarball.patch
+
+	# fix hash to be the same on LE/BE platforms
+	eapply "${FILESDIR}/${P}"-be-hash.patch
+
+	# handle mac-3 -> -4 API change
+	eapply "${FILESDIR}/${P}"-mac-4.patch
+
+	eapply_user
+}
+
+src_configure() {
+	# ./configure alike options.
+	local waf_params="--prefix=/usr \
+			--libdir=/usr/$(get_libdir) \
+			--with-target-platform=${CHOST} \
+			--mandir=/usr/share/man \
+			--infodir=/usr/share/info \
+			--datadir=/usr/share \
+			--sysconfdir=/etc \
+			--localstatedir=/var/lib"
+
+	local optionals=""
+	local plugins=""
+	if ! use server ; then
+		waf_params+=" --without-xmms2d"
+	else
+		# some fun static mappings:
+		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
+					"phonehome	et"
+					"ENABLED	launcher"
+					"mlib-update	medialib-updater"
+					"ENABLED	nycli"
+					"		perl"
+					"ENABLED	pixmaps"
+					"		python"
+					"		ruby"
+					"DISABLED	tests"
+					"DISABLED	vistest"
+					"cxx		xmmsclient++"
+					"cxx		xmmsclient++-glib"
+					"DISABLED	xmmsclient-cf"
+					"DISABLED	xmmsclient-ecore" # not in tree
+
+					"test		tests"
+				)
+
+		local plugin_map=(	# USE		# sorted xmms2 plugin flag (same, as USE if empty)
+					"		alsa"
+					"		airplay"
+					"		ao"
+					"ffmpeg		apefile"
+					"ffmpeg		avcodec"
+					"		asf"
+					"ENABLED	asx"
+					"		cdda"
+					"DISABLED	coreaudio" # MacOS only?
+					"		curl"
+					"ENABLED	cue"
+					"zeroconf	daap"
+					"ENABLED	diskwrite"
+					"ENABLED	equalizer"
+					"aac		faad"
+					"ENABLED	file"
+					"		flac"
+					"		fluidsynth"
+					"ffmpeg		flv"
+					"ffmpeg		tta"
+					"DISABLED	gme" # not in tree
+					"		gvfs"
+					"ENABLED	html"
+					"		ices"
+					"ENABLED	icymetaint"
+					"ENABLED	id3v2"
+					"		jack"
+					"ENABLED	karaoke"
+					"ENABLED	m3u"
+					"		mac"
+					"		mms"
+					"		mad"
+					"ENABLED	midsquash"
+					"		mp4" # bug #387961 (aac, mp3, ape can sit there)
+					"mp3		mpg123"
+					"		modplug"
+					"		musepack"
+					"DISABLED	nms" # not in tree
+					"ENABLED	normalize"
+					"ENABLED	null"
+					"ENABLED	nulstripper"
+					"		ofa"
+					"		opus"
+					"		oss"
+					"ENABLED	pls"
+					"pulseaudio	pulse"
+					"ENABLED	replaygain"
+					"xml		rss"
+					"		samba"
+					"DISABLED	sc68" #not in tree
+					"		sid"
+					"		sndfile"
+					"		speex"
+					"DISABLED	sun" # {Open,Net}BSD only
+					"DISABLED	tremor" # not in tree
+					"		vorbis"
+					"		vocoder"
+					"ffmpeg		tta"
+					"ENABLED	wave"
+					"DISABLED	waveout" # windows only
+					"		wavpack"
+					"xml		xspf"
+					"ENABLED	xml"
+				)
+
+		local option
+		for option in "${option_map[@]}"; do
+			optionals+=$(xmms2_flag $option)
+		done
+
+		local plugin
+		for plugin in "${plugin_map[@]}"; do
+			plugins+=$(xmms2_flag $plugin)
+		done
+	fi # ! server
+
+	# pass them explicitely even if empty as we try to avoid magic deps
+	waf_params+=" --with-optionals=${optionals:1}" # skip first ',' if yet
+	waf_params+=" --with-plugins=${plugins:1}"
+	waf_params+=" $(use_with valgrind)"
+
+	CC="$(tc-getCC)"         \
+	CPP="$(tc-getCPP)"       \
+	AR="$(tc-getAR)"         \
+	RANLIB="$(tc-getRANLIB)" \
+	CXX="$(tc-getCXX)"       \
+	    ./waf configure ${waf_params} || die "'waf configure' failed"
+}
+
+src_compile() {
+	# waf is very keen to run tests in build phase (bug #424377) but
+	# it does not bother running tests twice, so the hack below works:
+	./waf --verbose build || ./waf --verbose build || die "waf build failed"
+}
+
+src_test() {
+	# rerun tests
+	./waf --alltests || die "waf --alltests failed"
+}
+
+src_install() {
+	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
+	dodoc AUTHORS TODO
+}
+
+pkg_postinst() {
+	elog "This version is built on experimental development code"
+	elog "If you encounter any errors report them at https://bugs.xmms2.org"
+	elog "and visit #xmms2 at irc://irc.freenode.net"
+	if use phonehome ; then
+		einfo ""
+		einfo "The phone-home client xmms2-et was activated"
+		einfo "This client sends anonymous usage-statistics to the xmms2"
+		einfo "developers which may help finding bugs"
+		einfo "Disable the phonehome useflag if you don't like that"
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-11 16:09:52 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-11 16:09:52 +0000
commit	f78108598211053d41752a83e0345441bb9014ae (patch)
tree	dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /media-sound
parent	dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff)