gentoo resync : 01.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 03:04:39 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 03:04:39 +0000
commit: 407525b571b48cfd65e1ad7a02d250a927c967c9 (patch)
tree: 844bea44d85dc7218f54970af1c42cc9d55c3f1a /media-sound
parent: 89c6c06b8c42107dd231687a1012354e7d3039fc (diff)
60 files changed, 695 insertions, 873 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index f4053cb3d387..c7920d5c8d4c 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 98296b9e4008..1fcc50fe2229 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -4,18 +4,20 @@ AUX ardour-2.8.14-syslibs.patch 3766 BLAKE2B 672dfd25f80ee22169871dba0f21c13d5e5
 AUX ardour-4.0-lv2.patch 2095 BLAKE2B 33abbfa4affc525b7e43106fad29c3d1b18154aa58996b1a3ed50ca7bcf90fdea0e5fbbf870a35d6c43991afa0bc63cfb8b08f2bfa3427b910cc392b73e99efd SHA512 77688faf865874b8d64785b33d3837a47c16de640bcfc5ef20006aaf2f21df0b5a81c89c8d7cf1456dbf160cdea91c5c02488a15fad202d9bfdb5aff04cf1c73
 AUX ardour-4.7-gcc.patch 3081 BLAKE2B 88b56365ed3ad4fd02986573ec4091ce64304988a1591ef238f687dcbc191e44a9d9533315ff8a6228a624daac0dd610331d2e8eb469ded40498b1069b7ed845 SHA512 f01b60d00f2e66731cc0265a4c5fefb154eefd2b2a68bbfbefe483c37480c5b66e4978804e32fc700f20d75a67cff7076eec58ffff9efdfe4b3475d4f2c823af
 AUX ardour-4.x-revision-naming.patch 1107 BLAKE2B 18378f1cbc3bb7871ed599dd03c963e7d808796477838b84e9a1010bf31d175edcbba62dc076a37ff3cdf20868f32fc42c2fb2a687616be27a0ecf00b97afc3e SHA512 f9c742345b4f89bc0cabc7a7fe86c4084c99f962c3b3770a0e14b259fa4ca9a3f2cdac35c3b9214816f895fd083befab16e38d2b753cbe6ab94ca7da7b251580
-DIST ardour-2.8.16.tar.bz2 2169916 SHA256 37ee32119ba105fa0883faa7e18c58ecd5276894568da224a554d9ef49075e40 SHA512 02e74883cf466fcd5588ec8f2fd9d032b4611071d630b412c853a7ae7cb46045c0cde4308abbc78da3f54aae0ab1c32a980b8d1e1a965c8633ef43d8e08e0d0d WHIRLPOOL 357b45e506da05b1ce17f006c3e2b22b17150b5556e06785b961b308d958fb66fa82b3e01d1d5e596e43caf6b9d1c83287696a6c694e54114fed5825e2fc5a51
-DIST ardour-4.7.tar.gz 9863149 SHA256 dfa3d102b3f7bb0702969153d22d9311ac98c587f691760ab0f1d3f4f455a86d SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096 WHIRLPOOL eb94b56a919d0088a312414f45475f53ee8c7f618d85f9ffcf5f27719422c2035ff4608108ecbe0f521d54ed1ad40c06ada0a1cb8f7d70531320f40aa107e4b4
+DIST ardour-2.8.16.tar.bz2 2169916 BLAKE2B 47db892002f439312efdeec9840d96045a9852b078d4cd88de2fe089f510b904028cb7b0a2d2d39cf004a1bf60127bbfa91af6b9ff1118f3729f9c6d2363d14f SHA512 02e74883cf466fcd5588ec8f2fd9d032b4611071d630b412c853a7ae7cb46045c0cde4308abbc78da3f54aae0ab1c32a980b8d1e1a965c8633ef43d8e08e0d0d
+DIST ardour-4.7.tar.gz 9863149 BLAKE2B 1b81230a1add69506ad703b09cd683fad0ba5c78c30c1701b913ed42690665201541ff01ada9e5b913fc7000df1622cc9fb9b56fa95e46a48d6608ac4fc90f13 SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096
 DIST ardour-5.10.tar.bz2 8844840 SHA256 2d88fad771e8f4df4c1ff06836152d486f392a71b4f369759934419b679ddd0f SHA512 4dc8c43ed81b931e855f4a19b5674712a8322edaa06f466d5dd0eb93076a67da12795944c8f17b30b89bb5e87f54279fc2b21d147d48e98e5cb69a3f965a8bb8 WHIRLPOOL 1b8d23c58a5ecb04410df29daa0e73c308b58b843b000a607e4ef2cd78b94e250252654e1c39d34373b5482f141491532914298589bd13e260864044f0ee8b1a
-DIST ardour-5.3.tar.bz2 8244811 SHA256 1289002cb81e372b663f9d66e2923c066b64c48f9bec3a9884f7a59cb007945a SHA512 464c311cd3f3f4a580ad451be7a8143a3f2f7454364426c952e757999aba92af6611d0bc31f4d5e0ca301a3c79e4cd1ec19b01ec9941f34e6fa4cf338149291f WHIRLPOOL b7d999805f2b5dda2dc1fd92cbec76d499b15c0f7517c208e7c6b46b624dcd759b0c25a4ee9ec23d974500873c93a8b76e1f45395a25936d5641e47e3027f038
-DIST ardour-5.5.tar.bz2 9237459 SHA256 867605614f6840341d37c388f6c5acf803579172b7d7edbebb4c8e36c8bfde1f SHA512 63132681dda7890b8f455a8142935f0bdce28e718b98d1d79a9207ad86b25d31698285d28871bb5043b3b859efd8b1fb8b7b7324fa3abd952a7a9c8e1691e09c WHIRLPOOL 16a7cdc5b5893bbd4e6e86bf3f6d06dc236ad3c7062ba51f313fc472fd46e63f9508f761e9d20ff929e915591fc1d3153098b115909671e4c357003b6c21f733
-DIST ardour-5.6.tar.bz2 8590451 SHA256 d8a55121540e1de8c1a040162316434a2c82d75b8c9e9673ab2143662c848372 SHA512 6d7c72f4bb91e0d9d63dfb2273108e3f61bddac9c21f1f58fe6cb73d5f0a028e735d226c3aa2d1404916b566a103d556a2934b083a4c5d629ec7e28c0abd34f9 WHIRLPOOL a55ac78ad64b56678ca0a6f278a6a4e118d5a0aa8e2d5fa7309583c20f87d5df58408b3deee6cbb0b7a1390fa73ec3a766445d08d94709be02869cbc1aa059da
-DIST ardour-5.8.tar.bz2 8669692 SHA256 0138a7cdc30353a3ceb520fab4d636a9ffca2d4d031839d5aa4cd36dcccba886 SHA512 96b3a81f8c48f66839fb8cddeec5ed0c4a95a6092eab15eacb69007cf093cc6572c308e37c8acbc0194eeecf809980c22c04449fe65d683c298d8d0611e7950e WHIRLPOOL 9e2cdda574d39f8abbc9ef2a127124b132011de84eb9808c4d1ae44a746aa96b550ba49365d545d5614559df1fe0d9f844befec59c82bf9c5da956971a77d5e7
-DIST ardour-5.9.tar.bz2 8830842 SHA256 dffebbee16d3fce71e5f5657e99adb97a88515a6607e45397dd774e77b22f559 SHA512 1ba713f3953456260df9d183b30730c959f2707f8c9dd1280a3ab5eb5d9dbdd0e81db98150346f60f777f6bd02eeaaf9f9bcf43cf2ec0b5addce3b50fcbf7413 WHIRLPOOL 6fb7d0711b6d6bfeaf4c7f52bb3f518377f84a94eec3e27364b00998c83964e418127c7ad5d6726b88ef7ecf360a95e176a4d0feb0054018c83956afdeca2678
+DIST ardour-5.12.tar.bz2 8852834 BLAKE2B 0409d920ab0abc9e52a40cc343c5481d53292bea6e5c89c58328f95c53f7f09f30ce421f2ed0da0e3fdb4eaeeb5a25da0d07ed1d4c382b5b607f3b89324eca1b SHA512 c4b4332bddb2406924119c181622801725f4a7dd7741c1a66ddbc2236542764b786337da2f0a751f3bbe6e0389b5da765eb19b14a6a90c8f8a7fd68231e5067d
+DIST ardour-5.3.tar.bz2 8244811 BLAKE2B d2635ef720c03ec84bf481f09244c6fad78b857dcda52d7a40e0da9ce5c0a37f9cf5c8355429f86e17ddccb857a7b75c07481408dae2f10b8c71215e9ef8fa9e SHA512 464c311cd3f3f4a580ad451be7a8143a3f2f7454364426c952e757999aba92af6611d0bc31f4d5e0ca301a3c79e4cd1ec19b01ec9941f34e6fa4cf338149291f
+DIST ardour-5.5.tar.bz2 9237459 BLAKE2B 71e967202e46a7e7db1fc2717a8d27470e411dd686a5fd858da57aff72be1e277e20bd9f2568073cc91d21b6124af3ac3bf6024781fae344b83f4900025dc838 SHA512 63132681dda7890b8f455a8142935f0bdce28e718b98d1d79a9207ad86b25d31698285d28871bb5043b3b859efd8b1fb8b7b7324fa3abd952a7a9c8e1691e09c
+DIST ardour-5.6.tar.bz2 8590451 BLAKE2B ffafbac62d5bddfff2f4b4bda92692c1c7644050eec444e209f6b4d3b5c300c7ee39d46cd249196ca64b8a43c8716e5fc35272895dd059061669de629100697a SHA512 6d7c72f4bb91e0d9d63dfb2273108e3f61bddac9c21f1f58fe6cb73d5f0a028e735d226c3aa2d1404916b566a103d556a2934b083a4c5d629ec7e28c0abd34f9
+DIST ardour-5.8.tar.bz2 8669692 BLAKE2B 6628d0c6f81feb96f1d3bc5453cbeb3d5d7c012a2efa1e800d84fd1101c651bb4092e599ef6725507c6243a94107242a496b1b4f6df884bcaa8954c0f71a6861 SHA512 96b3a81f8c48f66839fb8cddeec5ed0c4a95a6092eab15eacb69007cf093cc6572c308e37c8acbc0194eeecf809980c22c04449fe65d683c298d8d0611e7950e
+DIST ardour-5.9.tar.bz2 8830842 BLAKE2B 4c025475528f7b0b58b18b9a075abab4805efa538af774bd7aa4b86da98c4df1ee639bb253f4326a11924d577c49a7af8c77098edf63a76205c60880bdac31b3 SHA512 1ba713f3953456260df9d183b30730c959f2707f8c9dd1280a3ab5eb5d9dbdd0e81db98150346f60f777f6bd02eeaaf9f9bcf43cf2ec0b5addce3b50fcbf7413
 EBUILD ardour-2.8.16-r1.ebuild 1885 BLAKE2B 25f568c1cd44b7d920d172e660697fcc89f35320d1e94b912f8920a11566fec2503524cdba603077a8887e30698b731ef0f3fda1f474abf99373de7cc276571f SHA512 f635237138d56fb03c6dd4704b76ebc6e7a667b50175324f5c83a4ae5b3cf581d987899efa50830a5608492a18067fc583d9c40d619a1309b64bf41f067b15a3
 EBUILD ardour-4.7-r1.ebuild 3751 BLAKE2B dcc961eeeda107714c8528d442d03216b31d91d422c49ef4ea040c958ec8d01acbfd53ba340481841e7c4d571d0cc37a7ddd667f6f9c666ae7abea4a04455183 SHA512 4dd4e31544c7ad9ac7d011bcb26c5c9fe6749fff0832283191b18b89d5812ede37449eb839af0668a7b28ecac7559396a1c0f5da7cb180edefef20edebbff43e
-EBUILD ardour-4.7-r2.ebuild 3794 BLAKE2B 206a3c08205d7d5ce9dbb3ebd4b62d0bfcba578f7e9f3c96e5be21e46c53c4dad897b8c281f5daa04fe217572c2cd9e0afef7ea8c4ede785a45dc109b3002292 SHA512 6fda1d81f66b6dc64c68ad179bca25868c7cb136937e173e82357e42f88bdaff4b198bf52b7c6e1a8b06d4e4814f3bce69c9cdf41f802ba64f30a8deaeecce77
+EBUILD ardour-4.7-r2.ebuild 3803 BLAKE2B 5d7a6b407cce616401c7d33f6954c0d0cd1cfd4fa733b29ae2e1d6a8faffd581bc3de6e77da20cb8fbdf8155fb72e0822c1825834747cbeace146f54827a78b0 SHA512 24006c9507e275cda278ccc18bc07acf7e04e5b11d29c233e91f57f07ca061644a1e05380b558f76ffebbab43bd503af1c4966c5a2101b3cf6536e9d2885d054
 EBUILD ardour-5.10.ebuild 3921 BLAKE2B f92f46309bd1a483874a3e0aac09c9c26f03791425c20879b8246e9b512e28ae1ba4b28f95c2e40e0d7b0ca4cac5bdb94144545d332ea9718977489c36eb9eb5 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92
+EBUILD ardour-5.12.ebuild 3921 BLAKE2B f92f46309bd1a483874a3e0aac09c9c26f03791425c20879b8246e9b512e28ae1ba4b28f95c2e40e0d7b0ca4cac5bdb94144545d332ea9718977489c36eb9eb5 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92
 EBUILD ardour-5.3-r1.ebuild 4021 BLAKE2B deb2d21fe2696353cc9c3a6cd6e8d8775b80b7c51757b55d530272a729d11c36a0adb499a81da164409a541f5888b6afa6f1ee41b931a5740e82a63616d46e68 SHA512 5a369fb2317720d8ede4ecb266acef8d69e963c20b1300ab5a47d2dc69d8df2860c2a8c5363f20148c0c71c5f988bfdc6f9a62c92291bf3863b03357d4cfdf13
 EBUILD ardour-5.5-r1.ebuild 3921 BLAKE2B f92f46309bd1a483874a3e0aac09c9c26f03791425c20879b8246e9b512e28ae1ba4b28f95c2e40e0d7b0ca4cac5bdb94144545d332ea9718977489c36eb9eb5 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92
 EBUILD ardour-5.6-r1.ebuild 3921 BLAKE2B f92f46309bd1a483874a3e0aac09c9c26f03791425c20879b8246e9b512e28ae1ba4b28f95c2e40e0d7b0ca4cac5bdb94144545d332ea9718977489c36eb9eb5 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92
diff --git a/media-sound/ardour/ardour-4.7-r2.ebuild b/media-sound/ardour/ardour-4.7-r2.ebuild
index 968572f28b59..dfce82a22d08 100644
--- a/media-sound/ardour/ardour-4.7-r2.ebuild
+++ b/media-sound/ardour/ardour-4.7-r2.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	>=media-libs/taglib-1.7
 	media-libs/vamp-plugin-sdk
 	net-misc/curl
-	sci-libs/fftw:3.0
+	sci-libs/fftw:3.0[threads]
 	virtual/libusb:0
 	x11-libs/cairo
 	>=x11-libs/gtk+-2.8.1:2
diff --git a/media-sound/ardour/ardour-5.12.ebuild b/media-sound/ardour/ardour-5.12.ebuild
new file mode 100644
index 000000000000..8998723b5075
--- /dev/null
+++ b/media-sound/ardour/ardour-5.12.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	>=media-libs/slv2-0.6.1
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( virtual/jack )
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare(){
+	eapply_user
+	if ! [[ ${PV} == *9999* ]]; then
+		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		--lv2 \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
+	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index ca2d56c78c2d..f8e542b49d50 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -6,4 +6,4 @@ EBUILD asunder-2.2.ebuild 763 BLAKE2B c78b5597cb260bb88a89737e8f386c8e1bd25a45f7
 EBUILD asunder-2.8.1.ebuild 1018 BLAKE2B c2ec47bf94c0bd707302b67905c40224d8836de59b5ce767f5196a6bfe52a881960df1213f864f0f7db28b020c8c7b75e45816f0cf38ce53376003190b229cf2 SHA512 b2dcba8f928fadda61294b804d6897f2661c04bd6a1ef8868d371627628263480907650b41e396401143d24419ba0acab30dd20f12126c23a69a32df64cf698f
 EBUILD asunder-2.9.1.ebuild 964 BLAKE2B 848b7ac90c5e14b17be7028a8157948452095ccefa4225a6fb770265b56e3216149e687c44c6c04e006633a9972125c36530b70eb79e643497310008c6a18cdb SHA512 ae4d3d3fc3c456433477dc78084044f181de66ff5f1686699593714344c901bbee6c65e5ff8886279119f9527022fc766ca2280b2d481c0cfb99b2f6ccd3e567
 EBUILD asunder-2.9.2-r1.ebuild 1079 BLAKE2B 35fa17f430b70c76c05717539abf28ef0f7066dc9a1cc1fdfb2e72c4440f5717b60862eacef8b0b7c988642f2fc69e4886c05230aaf15e992f6e6b273f01e4b4 SHA512 31cf34ae5650e91f69db5a649ede4c385c78909d2cb23d7c9d9152a361c9c4b6fbccee9cd4f1f3c739dcac98e2d022745a15550dc070cff3ddca07a48447a7d4
-MISC metadata.xml 405 BLAKE2B a205157490360dc3f59fddcf2c8bf81491f51c4819a7ef6c6f4e7ad304d7c413e38b927a3c895ab9c665a0f5cbee85a86dd31231bfbdc24ebcca04489de35881 SHA512 97a0107ea08e3e810e952625df66d990d4144915a3e6ab2504ca0432c129b99394ad702a4b4bfd3324fa213fad4445e66fb0eef53d628a989bd24431d156aaef
+MISC metadata.xml 407 BLAKE2B 3977485349c4dbb217e3ddcafaf22c7d394b764e6196a21fc63781ccf16a989ffd00faa0d4fbd9ff1c7bd35879d3cfdf586d0b5723b3e09d78fc034bf9736a5b SHA512 504625a32837ff424070b0fa4e691e71b0be4270958289c10d768790750842c581c919332747b26d7c43ada99d007e6517ff181474d668fcedc1ded21ae32f21
diff --git a/media-sound/asunder/metadata.xml b/media-sound/asunder/metadata.xml
index f5afbca69616..06e70988f837 100644
--- a/media-sound/asunder/metadata.xml
+++ b/media-sound/asunder/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  <email>sound@gentoo.org</email>
-  <name>Gentoo Sound project</name>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
 	</maintainer>
-<use>
-  <flag name="mac">Support for creation of Monkey's Audio files (APE)</flag>
-  <flag name="opus">Support for creation of Opus files</flag>
-</use>
+	<use>
+		<flag name="mac">Support for creation of Monkey's Audio files (APE)</flag>
+		<flag name="opus">Support for creation of Opus files</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index f1543c3a8fe8..6aa29d6be1c1 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -4,4 +4,4 @@ DIST beets-1.4.3.tar.gz 1428494 SHA256 b93fbe11998a29cd432b0a88741b9ced0e5ac50e8
 EBUILD beets-1.3.13-r1.ebuild 2677 BLAKE2B eb9c8c9685fc8c8c548d9ceef70e1f588a83d6e2d8f55107e67c22255941c9bcd9c353e84c2b1ae0f9a512d7ef7a05f06d48cf3bf7a99f2fee7b61b35b0a674e SHA512 6a683c225410602033eb85b8d5bc9616e0dde085f52c775beebe7f8bc4c15217def7934dd3101d2e6bc90c2d5ca3db8b6af351a958e08956d6ebd921ed08f539
 EBUILD beets-1.3.19.ebuild 2746 BLAKE2B 2ac64a9a9b1d73397e7e5c22b36934cc1046e81dd769d53a1e10e35bc540ef4120c5abf65ca9e9b3b162c169c17ac820ea0fbb460180917794d2112e9abe75e3 SHA512 8c8926b6dbefafef6f7fde48450b1c721c7e2079baec64a2c75838b149ce1af5c31b6dafdd0d2b0063f3fc7a68f2d5da8af8389b3757959815dfa56deff44eb0
 EBUILD beets-1.4.3.ebuild 3066 BLAKE2B 8d57c44b147b784666f6f793dba38e64bd361b9feaa11b7f468fe6e84e1b5393e8d4147a538f5f95bfa4696e7b3005d54ccaaef2bf90f2eb383e0aef73347619 SHA512 489fe8cf53512859602a43dbd0d9cbf5188453acd3c61f911bf391670d8942b71a15a93ab9853c69faefaadffb92a8e7dba9435d4b746740586e5804a07dcea4
-MISC metadata.xml 2713 BLAKE2B 679aa848492962b7ce8912a0a16b5743db548c767000ba85736ad575cff250903232c5bf7dd0aa215ec74928754b2441687d51f2ee344b68e1c1e6d0565af3ca SHA512 0df7e29ad135bbfd5bb01b7efe34e378c0d56c8bba9535ca2fd93362d2c62c863c9bcbbbad6df37d1f1a31abb6f886fa9285b91852667ae15c1d2dd37472d941
+MISC metadata.xml 2577 BLAKE2B dcd49b8888d4e54b9a6ad53f18864773285aeb4d98dd98bba680968d217a474d141d2730126c27f7778a4d984e113445c390a538ceaa7961227289916905aebf SHA512 7a6178f3e0f60ac36bbf2408c2a5b98ddbb3407d2aa6e44317c7b71bba917079bd71b777d837e2921f5eb4dad7cee35a276aab020db610551b5da314810e52a5
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index a6f2243141f4..46b548c1ee8c 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -1,57 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-  </maintainer>
-  <longdescription lang="en">
-    The purpose of beets is to get your music collection right once and for
-    all. It catalogs your collection, automatically improving its metadata as
-    it goes using the MusicBrainz database. (It also downloads cover art for
-    albums it imports.) Then it provides a bouquet of tools for manipulating
-    and accessing your music.
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		The purpose of beets is to get your music collection right once and for
+		all. It catalogs your collection, automatically improving its metadata as
+		it goes using the MusicBrainz database. (It also downloads cover art for
+		albums it imports.) Then it provides a bouquet of tools for manipulating
+		and accessing your music.
 
-    Because beets is designed as a library, it can do almost anything you can
-    imagine for your music collection. Via plugins, beets becomes a panacea:
-    * Embed and extract album art from files’ tags.
-    * Listen to your library with a music player that speaks the MPD protocol
-    and works with a staggering variety of interfaces.
-    * Fetch lyrics for all your songs from databases on the Web.
-    * Manage your MusicBrainz music collection.
-    * Analyze music files’ metadata from the command line.
-    * Clean up crufty tags left behind by other, less-awesome tools.
-    * Browse your music library graphically through a Web browser and play it
-    in any browser that supports HTML5 Audio.
+		Because beets is designed as a library, it can do almost anything you can
+		imagine for your music collection. Via plugins, beets becomes a panacea:
+		* Embed and extract album art from files’ tags.
+		* Listen to your library with a music player that speaks the MPD protocol
+		and works with a staggering variety of interfaces.
+		* Fetch lyrics for all your songs from databases on the Web.
+		* Manage your MusicBrainz music collection.
+		* Analyze music files’ metadata from the command line.
+		* Clean up crufty tags left behind by other, less-awesome tools.
+		* Browse your music library graphically through a Web browser and play it
+		in any browser that supports HTML5 Audio.
 
-    If beets doesn’t do what you want yet, writing your own plugin is
-    shockingly simple if you know a little Python.
-  </longdescription>
-  <use>
-    <flag name="badfiles">
-      Validate MP3 &amp; FLAC files.
-    </flag>
-    <flag name="bpd">
-      Enable support for <pkg>media-sound/mpd</pkg> server emulation
-    </flag>
-    <flag name="chroma">Enable support for acoustic fingerprinting plugin using
-      <pkg>media-libs/chromaprint</pkg></flag>
-    <flag name="convert">Enable support for the convert plugin which makes it
-      possible to transcode files</flag>
-    <flag name="discogs">Enable support for the discogs API plugin</flag>
-    <flag name="lastgenre">Enable support for importing music genres from
-      last.fm tags</flag>
-    <flag name="lastimport">Enable support for importing your last.fm playcounts</flag>
-    <flag name="mpdstats">Enable support for collecting statistic about
-      listening habits from <pkg>media-sound/mpd</pkg></flag>
-    <flag name="opus">Enable opus support in gstreamer-based replaygain</flag>
-    <flag name="replaygain">Enable support for Replay Gain metadata calculation
-      during import</flag>
-	<flag name="thumbnails">Generate thumbnails for albums</flag>
-    <flag name="web">
-      Enable embedded webserver support through <pkg>dev-python/flask</pkg>
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="pypi">beets</remote-id>
-  </upstream>
+		If beets doesn’t do what you want yet, writing your own plugin is
+		shockingly simple if you know a little Python.
+	</longdescription>
+	<use>
+		<flag name="badfiles">Validate MP3 &amp; FLAC files</flag>
+		<flag name="bpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation</flag>
+		<flag name="chroma">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
+		<flag name="convert">Enable support for the convert plugin which makes it possible to transcode files</flag>
+		<flag name="discogs">Enable support for the discogs API plugin</flag>
+		<flag name="lastgenre">Enable support for importing music genres from last.fm tags</flag>
+		<flag name="lastimport">Enable support for importing your last.fm playcounts</flag>
+		<flag name="mpdstats">Enable support for collecting statistic about listening habits from <pkg>media-sound/mpd</pkg></flag>
+		<flag name="opus">Enable opus support in gstreamer-based replaygain</flag>
+		<flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
+		<flag name="thumbnails">Generate thumbnails for albums</flag>
+		<flag name="web">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">beets</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/google-musicmanager/Manifest b/media-sound/google-musicmanager/Manifest
deleted file mode 100644
index 1e76a614e7f3..000000000000
--- a/media-sound/google-musicmanager/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST google-musicmanager-beta_1.0.129.6633-r0_amd64.deb 4040482 SHA256 79af991409d69b0759d75b90b0c754a5e1bd71ec291adc48b368ff1ac4b902bb SHA512 c3e605078ecff45804e1e7b9019ed8cadd108f7a4a6101ea197116fb0d783014cd9d74e883d88808bc841b64fc2495ad16ba2617d165415e6f1fda706e39cc34 WHIRLPOOL dbb3e23d0872dbcee4895f560b351a9dfda214d42760d808c09a6108f9281b85e13785c2efe652e7398112896c8a931032da52708192a93593a42c5e88c4d28e
-DIST google-musicmanager-beta_1.0.129.6633-r0_i386.deb 3977534 SHA256 7914e3e6e2adb2e952ebaf383db5e04727c29cfa83401007f29977f6c5ff6873 SHA512 3e7ad72477dae3ad63aaf0bc6def013049d6c0dabc7c3f063c567d9b69dbffcb75d24dd0fad21752e587629fa96bc57302cf79b17979ed281ef603df1e2c7c5e WHIRLPOOL b7635a00a5c736f13940cecfd7c98bc2fca64da89f0aca24f72aa5ee4edeba1bcebd6e2f11c758b039b01bf5313290dd0499b88eb2e2912a612bd4e2fc4c627d
-DIST google-musicmanager-beta_1.0.221.5230-r0_amd64.deb 4330938 SHA256 67e063d58508a4b8df37ea0b87c9a33e54143be3653daabe16b1276ffed21ac0 SHA512 cf093c2f8e3010432ce5fcd0614fbece0d02c082cfad1d82c39a5b7498d92f9cfc3f275c0dec8a1090841ce296169adce3353111aeb2bf5990f242be78ccc04d WHIRLPOOL 4d24fa84422ab280be018b07ab79c9ece627f4f00d2d800d3b817dc0f1cd77222505ceda0071a3ef1b8792aa73eb7c0e2bae3ec17cb4951e4e533a3ee71b3a81
-DIST google-musicmanager-beta_1.0.221.5230-r0_i386.deb 4189032 SHA256 31b48b6df317dec41ec5d3c5b6e19ea89ac6eb200d90bb28beab087dfab70c61 SHA512 276071acecc143b65dd5a14a60b7dfb1245818e6c3bb569883d1dab83841f228d6537b161446cf0bb2c115f95844da21951d94bb88e60e6494d0f5e8d0c3f19a WHIRLPOOL 6a0a38732ac301a6130d978f1b7bdcfd1b8949aa8954a47ea09c0dfc4298dfbcc029c3f6ef7ccd5a126feeedaf546e0729f79275f18496472177853ef85d931d
-DIST google-musicmanager-beta_1.0.243.1116-r0_amd64.deb 4361868 SHA256 54f97f449136e173492d36084f2c01244b84f02d6e223fb8a40661093e0bec7c SHA512 7af9d085b819be630bfa9e5f8668721c64cecd2052f4eaab4d1b15be25be2b0e442ac33a5e790c80ed68f27d4ece16d64aaef85c2bb97cf3fe24a084aec48d55 WHIRLPOOL 5a088ca30995e0231f2bed0effeb954c49435f4ee92d714b64339c6212e05c33aab8af21f6f90d5c0994cd7252ab7bf0a831d0c6ee931a51140a1b07bbddf83f
-DIST google-musicmanager-beta_1.0.243.1116-r0_i386.deb 4221330 SHA256 121a7939015e2270afa3f1c73554102e2b4f2e6a31482ff7be5e7c28dd101d3c SHA512 e579fddc34d0ae1633310e5deabc815d3e8a64bec1754c0d6ce2dd829fb7eece41e43cab862047f88469eec3190d1829e9968765ae12e4da8cd28ebe6f7688f5 WHIRLPOOL 1a9c385c9a94519fb9490eef1b6b99ba4ef48b4b52f8b06c2a6aea88e482ccb216d122da7327c905ef98d791abdce574de0f7a82f52dc037787666b6a73dc74a
-EBUILD google-musicmanager-1.0.129.6633_beta.ebuild 2542 BLAKE2B 11d994ab7ff0e9a601234fa8b8473bf4d31dd6a5f2470f0963a144a1e34111c80c25565772697ab61e61b66dc4c65095946e0ce926eff24649f301921c9137c7 SHA512 de94f219c4b6ecb2799d5dfd0e961ae0126cc5fdb6eee695845f8b7ab60f5fecfe3059ee12f70446d01a5afbfa5e0c50ec300f7ea824cb32c5472282a512d253
-EBUILD google-musicmanager-1.0.221.5230_beta.ebuild 2470 BLAKE2B cd3c0e82a05a3c4778383a18b28b3b38cd55337e5a8a25745a92e4414f92e48bf70e5519d0778d57b4aa66bc70e3257ef14fedd1e272ed6cd18e991f650977a9 SHA512 dece17dadec894d824e8ab496be0ee63f98900f8fdbc87354bc69a05721e7941157a140bde90c991a517b4ac83857e68469a6f01623121b0894ca5b7cc814723
-EBUILD google-musicmanager-1.0.243.1116_beta.ebuild 2468 BLAKE2B b712a39267ca10051ce3b22426dc32e78f15104bf70b8245a549e0a05ea822e2db334d618e302b1765f7aeebd6a7ce8b301c1f43556cd8c7380eff2a19f61f9e SHA512 143d626dd42045b000525799eeae328a0884859f819f98bb012c472b7016dff7d8d5696a6985e374a691c4819fc9b13985c6c69f8fdb0da4f666cb3463aab746
-MISC metadata.xml 355 BLAKE2B 488b4563e98a8ceff9c7890865ccb8ee7ad6dd538c84367e69889138ef43e34c8da4d9dfff80c820bf8a4c583122ded4e95417c20ac3ff7e3963785ab40e7634 SHA512 d1cb086a795f3885761aafe4a6e103a181d6fb2301b29dd0676a9c216600aef660adc567a688734916a1844a510d472d46400aea9e8a9fca6acc528d3604d6bc
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.129.6633_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.129.6633_beta.ebuild
deleted file mode 100644
index 77dc118a56bc..000000000000
--- a/media-sound/google-musicmanager/google-musicmanager-1.0.129.6633_beta.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils unpacker
-
-#https://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-i386/Packages
-MY_URL="https://dl.google.com/linux/musicmanager/deb/pool/main/${P:0:1}/${PN}-beta"
-MY_PKG="${PN}-beta_${PV/_beta}-r0_i386.deb"
-
-DESCRIPTION="Google Music Manager is a application for adding music to your Google Music library"
-HOMEPAGE="https://music.google.com"
-SRC_URI="x86? ( ${MY_URL}/${MY_PKG} )
-	amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )"
-
-LICENSE="Google-TOS Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 openssl ZLIB libtiff"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="log"
-
-OBSOLETE="yes"
-[[ $OBSOLETE = yes ]] && RESTRICT="fetch strip" || RESTRICT="strip mirror"
-
-RDEPEND="
-	dev-libs/expat
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtwebkit:4
-	media-libs/flac
-	media-libs/libvorbis
-	net-dns/libidn
-	sys-libs/glibc
-	log? ( dev-libs/log4cxx )
-	"
-
-DEPEND="app-arch/xz-utils
-	app-admin/chrpath"
-
-INSTALL_BASE="opt/google/musicmanager"
-
-QA_TEXTRELS="${INSTALL_BASE}/libmpgdec.so.0"
-
-QA_FLAGS_IGNORED="${INSTALL_BASE}/.*"
-
-S="${WORKDIR}/${INSTALL_BASE}"
-
-pkg_nofetch() {
-	if [[ ${OBSOLETE} = yes ]]; then
-		elog "This version is no longer available from Google and the license prevents mirroring."
-		elog "This ebuild is intended for users who already downloaded it previously and have problems"
-		elog "with ${PV}+. If you can get the distfile from e.g. another computer of yours, or search"
-		use amd64 && MY_PKG="${MY_PKG/i386/amd64}"
-		elog "it with google: https://www.google.com/search?q=intitle:%22index+of%22+${MY_PKG}"
-		elog "and copy the file ${MY_PKG} to ${DISTDIR}."
-	else
-		einfo "This version is no longer available from Google."
-		einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
-		einfo "Please file a version bump bug on https://bugs.gentoo.org (search	existing bugs for ${PN} first!)."
-	fi
-}
-
-src_install() {
-	insinto "/${INSTALL_BASE}"
-	doins config.json product_logo* lang.*.qm
-
-	exeinto "/${INSTALL_BASE}"
-	chrpath -d MusicManager || die
-	doexe MusicManager google-musicmanager minidump_upload
-	#TODO unbundle this
-	doexe libaacdec.so libaudioenc.so.0 libmpgdec.so.0 libid3tag.so
-
-	dosym /"${INSTALL_BASE}"/google-musicmanager /opt/bin/google-musicmanager
-
-	local icon size
-	for icon in product_logo_*.png; do
-		size=${icon#product_logo_}
-		size=${size%.png}
-		newicon -s "${size}" "${icon}" ${PN}.png
-	done
-	domenu ${PN}.desktop
-}
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.221.5230_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.221.5230_beta.ebuild
deleted file mode 100644
index 75911e316b35..000000000000
--- a/media-sound/google-musicmanager/google-musicmanager-1.0.221.5230_beta.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils unpacker
-
-#https://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-i386/Packages
-MY_URL="https://dl.google.com/linux/musicmanager/deb/pool/main/${P:0:1}/${PN}-beta"
-MY_PKG="${PN}-beta_${PV/_beta}-r0_i386.deb"
-
-DESCRIPTION="An application for adding music to your Google Music library"
-HOMEPAGE="https://music.google.com"
-SRC_URI="x86? ( ${MY_URL}/${MY_PKG} )
-	amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )"
-
-LICENSE="Google-TOS Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 openssl ZLIB libtiff"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="log"
-
-OBSOLETE="yes"
-[[ $OBSOLETE = yes ]] && RESTRICT="fetch strip" || RESTRICT="strip mirror"
-
-RDEPEND="
-	dev-libs/expat
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtwebkit:4
-	media-libs/flac
-	media-libs/libvorbis
-	net-dns/libidn
-	sys-libs/glibc
-	log? ( dev-libs/log4cxx )
-	"
-
-DEPEND="app-arch/xz-utils
-	app-admin/chrpath"
-
-INSTALL_BASE="opt/google/musicmanager"
-
-QA_PREBUILT="${INSTALL_BASE}/.*"
-
-S="${WORKDIR}/${INSTALL_BASE}"
-
-pkg_nofetch() {
-	if [[ ${OBSOLETE} = yes ]]; then
-		elog "This version is no longer available from Google and the license prevents mirroring."
-		elog "This ebuild is intended for users who already downloaded it previously and have problems"
-		elog "with ${PV}+. If you can get the distfile from e.g. another computer of yours, or search"
-		use amd64 && MY_PKG="${MY_PKG/i386/amd64}"
-		elog "it with google: https://www.google.com/search?q=intitle:%22index+of%22+${MY_PKG}"
-		elog "and copy the file ${MY_PKG} to ${DISTDIR}."
-	else
-		einfo "This version is no longer available from Google."
-		einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
-		einfo "Please file a version bump bug on https://bugs.gentoo.org (search	existing bugs for ${PN} first!)."
-	fi
-}
-
-src_install() {
-	insinto "/${INSTALL_BASE}"
-	doins config.json product_logo* lang.*.qm
-
-	exeinto "/${INSTALL_BASE}"
-	chrpath -d MusicManager || die
-	doexe MusicManager google-musicmanager minidump_upload
-	#TODO unbundle this
-	doexe libaacdec.so libaudioenc.so.0 libmpgdec.so.0 libid3tag.so
-
-	dosym /"${INSTALL_BASE}"/google-musicmanager /opt/bin/google-musicmanager
-
-	local icon size
-	for icon in product_logo_*.png; do
-		size=${icon#product_logo_}
-		size=${size%.png}
-		newicon -s "${size}" "${icon}" ${PN}.png
-	done
-	domenu ${PN}.desktop
-}
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.243.1116_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.243.1116_beta.ebuild
deleted file mode 100644
index 58d3736b6251..000000000000
--- a/media-sound/google-musicmanager/google-musicmanager-1.0.243.1116_beta.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils unpacker
-
-#https://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-i386/Packages
-MY_URL="https://dl.google.com/linux/musicmanager/deb/pool/main/${P:0:1}/${PN}-beta"
-MY_PKG="${PN}-beta_${PV/_beta}-r0_i386.deb"
-
-DESCRIPTION="An application for adding music to your Google Music library"
-HOMEPAGE="https://music.google.com"
-SRC_URI="x86? ( ${MY_URL}/${MY_PKG} )
-	amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )"
-
-LICENSE="Google-TOS Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 openssl ZLIB libtiff"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="log"
-
-OBSOLETE="no"
-[[ $OBSOLETE = yes ]] && RESTRICT="fetch strip" || RESTRICT="strip mirror"
-
-RDEPEND="
-	dev-libs/expat
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtwebkit:4
-	media-libs/flac
-	media-libs/libvorbis
-	net-dns/libidn
-	sys-libs/glibc
-	log? ( dev-libs/log4cxx )
-	"
-
-DEPEND="app-arch/xz-utils
-	app-admin/chrpath"
-
-INSTALL_BASE="opt/google/musicmanager"
-
-QA_PREBUILT="${INSTALL_BASE}/*"
-
-S="${WORKDIR}/${INSTALL_BASE}"
-
-pkg_nofetch() {
-	if [[ ${OBSOLETE} = yes ]]; then
-		elog "This version is no longer available from Google and the license prevents mirroring."
-		elog "This ebuild is intended for users who already downloaded it previously and have problems"
-		elog "with ${PV}+. If you can get the distfile from e.g. another computer of yours, or search"
-		use amd64 && MY_PKG="${MY_PKG/i386/amd64}"
-		elog "it with google: https://www.google.com/search?q=intitle:%22index+of%22+${MY_PKG}"
-		elog "and copy the file ${MY_PKG} to ${DISTDIR}."
-	else
-		einfo "This version is no longer available from Google."
-		einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
-		einfo "Please file a version bump bug on https://bugs.gentoo.org (search	existing bugs for ${PN} first!)."
-	fi
-}
-
-src_install() {
-	insinto "/${INSTALL_BASE}"
-	doins config.json product_logo* lang.*.qm
-
-	exeinto "/${INSTALL_BASE}"
-	chrpath -d MusicManager || die
-	doexe MusicManager google-musicmanager minidump_upload
-	#TODO unbundle this
-	doexe libaacdec.so libaudioenc.so.0 libmpgdec.so.0 libid3tag.so
-
-	dosym /"${INSTALL_BASE}"/google-musicmanager /opt/bin/google-musicmanager
-
-	local icon size
-	for icon in product_logo_*.png; do
-		size=${icon#product_logo_}
-		size=${size%.png}
-		newicon -s "${size}" "${icon}" ${PN}.png
-	done
-	domenu ${PN}.desktop
-}
diff --git a/media-sound/google-musicmanager/metadata.xml b/media-sound/google-musicmanager/metadata.xml
deleted file mode 100644
index 8b1c84134af7..000000000000
--- a/media-sound/google-musicmanager/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<use>
-		<flag name="log">Enables advanced logging through <pkg>dev-libs/log4cxx</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
index 292d61934e79..0502c7a143a1 100644
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -4,4 +4,4 @@ AUX herrie-chost_issue.patch 547 BLAKE2B 2310336da0c3e9af7f7758cfe33293694d5a5c0
 DIST herrie-2.2.tar.bz2 71596 SHA256 142341072920f86b6eb570b8f13bf5fd87c06cf801543dc7d1a819e39eb9fb2b SHA512 7f89100f1c3376d03ebc5e5e3caadccb063470ab623c7b207e9e6aaa01d7e1885d4234e3a50675bc1ade07f5ab52a34022f4e18c9a5b4f9537baa7318f4ab213 WHIRLPOOL 78c2847bda36ccf8504d46621a6e1b25e17dca4ee3831311e0a4b76e1109e9ad91f86176c885bc945cc875f7d1a98567851358202a8630aa098f2d4e07434067
 EBUILD herrie-2.2-r1.ebuild 1959 BLAKE2B 50666b431bc0dc7bbf96501c92428cfb9789d303467528ff5739475fd59794994d8ba0a7c72d53ac23fb787d4a1c0e73146c476adba0236df762675ee25b6674 SHA512 2f52a4d295b94026a84de2f06bd3d0acf12d335bccfdcd04e2a784dac8674c7a9a7a4371074978b250bb999e432d4137d8af201b24671035142594686ba16239
 EBUILD herrie-2.2.ebuild 2207 BLAKE2B 71c30dab10f3d311be1c4497f53b80cf02969b5c47c75b8d23951293b42868d341a5e9ed3651576878a3ea20562912dd3d213c427bfd06b741a8d2f1ec7bd1db SHA512 7838dafa3eb1807a9f8235ebbf4b0211b12134a2841651ac4927c44c214ef295bcbcda03364d971097cbcdcdf5cda382b761dbd7bbfa98eaf2330b7ed6442ccc
-MISC metadata.xml 1068 BLAKE2B fd9f5522b4aac3586cb406d5f085ced4ceebe3c8987b4fe8debe43274efbd3f813ebf953449028bf463b4408f31231b65ed97016bb90892acb901395f85e77e5 SHA512 d7e009ac1e52214dcf7340ce4755700ff5620e4e1217b005d531f08fbe7b633aeb3b8b27c66336af5515dbce5e94bf0e600435c5f911a8abfb98ae95258d5d0e
+MISC metadata.xml 1055 BLAKE2B fe6982ef85121180c38c9beaa2699940a56dc68f996d1a49c56ad7d16401b3dd2e23a6101357e577b5f271e8313390a979aabe79c9b8e591543dd81ef3fffd39 SHA512 0a987472d87f237e821363b4c6b4cdafce6a5ce43d31a30f09e7f8e9499a9b7b013a02e2d31cbf61be62ff845dec0c21f6b13f7c64ecf2a72666008450ee7dc3
diff --git a/media-sound/herrie/metadata.xml b/media-sound/herrie/metadata.xml
index 1f60fffd9530..94eb56d9752a 100644
--- a/media-sound/herrie/metadata.xml
+++ b/media-sound/herrie/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription lang="en">
 		Herrie is a minimalistic music player that uses the command
 		line. It is written to support a variety of operating systems,
 		audio subsystems and file formats, including playlists.
@@ -20,8 +20,8 @@
 		for AudioScrobbler and the ability to chroot() itself
 		into a directory.
 	</longdescription>
-  <use>
-    <flag name="http">Enable http streaming</flag>
-    <flag name="xspf">Enable support for reading and saving XSPF playlists</flag>
-  </use>
+	<use>
+		<flag name="http">Enable http streaming</flag>
+		<flag name="xspf">Enable support for reading and saving XSPF playlists</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 36c4c16df03d..289cec0e249d 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -7,4 +7,4 @@ DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 SHA256 3517b5bff82139a76b2
 EBUILD jack-audio-connection-kit-0.121.3-r1.ebuild 2433 BLAKE2B 89d3f2ceedf99f5702b244a59b3708ed772e21248bf37b04b6edd266adc83b80bdcd53102ce68af912b055f61fa4aad96c36bd6c5155859a65e83863d28e6e6f SHA512 e0aeef4456bcee0452c3cdff0489fa0616d350c41b0a311babfc3889a15795694dd3b68ede5a02725fbfeaad20471ee77647e714148380464c7464a09f80f0a5
 EBUILD jack-audio-connection-kit-0.124.1-r1.ebuild 2236 BLAKE2B 632ee6e07b7445497d6af2857d6946a8e5fefc5973004e668935e6b71e64271b8f338fac97a94ad90db9636734422bb3a31777ff9f5a7b301661e29bff35d93e SHA512 16590aaef08b6aa3ecac4127ee773437f13fd1d549dd82ba97f2bbadc1d99a6804fe8018cf6d379f368e9ca53f8305b33608d9a82d4f6c61443de8d59b5b4d99
 EBUILD jack-audio-connection-kit-0.125.0.ebuild 2208 BLAKE2B ce160d4d73efd5e1e1a6d96ccf72e8504cf58e53c7115eada5bedcfad9e2327e118e16d7ec1e88948ed22e2a8dc1137e99a9c3f0f462ddb9cb9a0b9689bf154b SHA512 daa74d4b5e7491b552fcd62f01db5c9a0cff3ae1f9807be72b664fdc5ddb2a692bb7f688d1713d0a8bde16d0d9fd2f2945f0d48de96de167bdaa09a1ee67569a
-MISC metadata.xml 525 BLAKE2B 65511eff268f641bcbaa9e87243e797a8594cfea4179b13bf2eae2d55cbb7e8015bf66e118866ddce0d44aefcf0d63dc4cbddcfd85a23ec536c5198815d3fa17 SHA512 7c51cb4ac632fa0eb529b3fb5044d50d75c66bd0f15ae36140c758e8410a58c61550104cf241000247cbd32c211f16e92f147801a5074a7d1e0cf1fd07927714
+MISC metadata.xml 514 BLAKE2B 920e43b1a4ee5e4040d05a3dd62f677943ea7166a013e82d06f255d9a0d79d99af927bc5428517232dd7d21392f74b15c40c2d2e781d720abe1c153bc85ccadf SHA512 1fc2dd1efb39c6c002c5ad647a4f5134c841138546f66300db8ce93c979522ee29c4e74cea86e6bba4fe8d5414dfd5a25cb1d98803511450cbd22933ce474c1d
diff --git a/media-sound/jack-audio-connection-kit/metadata.xml b/media-sound/jack-audio-connection-kit/metadata.xml
index b01bff8f965e..da3dcaba033a 100644
--- a/media-sound/jack-audio-connection-kit/metadata.xml
+++ b/media-sound/jack-audio-connection-kit/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-  <use>
-    <flag name="coreaudio">Build the CoreAudio driver on Mac OS X systems</flag>
-    <flag name="cpudetection">Enables runtime cpudetection</flag>
-	<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
-  </use>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="coreaudio">Build the CoreAudio driver on Mac OS X systems</flag>
+		<flag name="cpudetection">Enables runtime cpudetection</flag>
+		<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index ec5c74aeb737..155275d2d6f9 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,15 +1,13 @@
 AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e
 AUX lilypond-2.17.2-tex-docs.patch 608 BLAKE2B 7cf73d59a6ebadbc34952c199ba1085e6fcebafebe613b041dc8d16fae051380e051d72a2617bcc96fe382de55bfcf4e06d14c4cdd9cc1ac6a9c44a60f49ef68 SHA512 fe22e649e12ba1aacf05dab14b1820d636d58dce252832331577935db2c0e565b3ec6073c6bec11a05a4c1254ddd1495252e6b3e41623e290363eb124e7fa6c1
 AUX lilypond-2.18.2-fontforge.patch 924 BLAKE2B 5f128e65357033c2b2ae33d5f00cccd7237b59354342d33f958170e5f22d904a47aeb18dcb12b7f7c8846d3689ed7d39459b4995c99834603dc22f3b2c893fda SHA512 f4a45a1ed601c114df24e9e20aa083cd30d5b77955e19cac309508af2f59c808a629bc82bc181e5325d0534d29d3fe4de53029d2db317ed447e306e11150ef7f
-DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c
+DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 DIST lilypond-2.19.54.tar.gz 17068093 SHA256 0ee709f1e58caf13cf5abea9bb74179ba5c7a4f2dc470ec48d9aefb553e68a58 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b WHIRLPOOL 7ce1cc7e89c5907515f8505a1e1efe1aadf8df48c24d70a2fe39924cf9301b6c676121e6c6ceac75b76a085e5d940c6c3bb6c31e87d314dda72c68f0af1307c8
-DIST lilypond-2.19.61.tar.gz 17154903 SHA256 fc42103824cbd9e5d230ded0f73c8ecffae14998b2ad2e136914f7eab1eecb0a SHA512 870d747f6d29644824e965f4a0ff37555afbf8d8013f01965f64d4b95ca6487d15468aee27fa44036ed2d35b00f8e9bc69c22a670ad97f04ae39a16d57ea83b9 WHIRLPOOL bc690e42b2b52a5b39dea956f83558e3adb72f8027a1acb2441cd104fd5d85f2860f2a9f0c76ec882a9404ed6cbfcecd3ee4aa60d3148e79405ca9487e4de26f
-DIST lilypond-2.19.63.tar.gz 17172960 SHA256 803f3bbf87d68fbde4ea364fc62394e5907e73cecd6188bb8f12fa4f433d9b43 SHA512 58f8922e2965bb37a08472f49d88e650d2c530a29e4672b858c0d8d91dbd8a94db78668c37424ab59084cc03c7cd07e931b138374d351ecd580f23986035f106 WHIRLPOOL 926916f23237c6ea10aaae4081b00c04aa10706cf81be51d99afba2e1eb8c8638039def026a16b6cca2e0d57120e737f0f2d4809c1e12118e78a987467162749
-DIST lilypond-2.19.64.tar.gz 17174255 SHA256 9b660fe99914c54cf30b391976d6e30f7dc7683928b3bf9b3454250c86990137 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9 WHIRLPOOL b13d8d9fc72392653d090175ec4cba7858ed7015607e4c249454a42a4d3027f5c1799f527aab86b57eac38b36510ce5b08b7b79f3f536386c14b7f3f285ed15c
-EBUILD lilypond-2.18.2-r3.ebuild 3229 BLAKE2B 3dffa2d207370b3ca8ba881748f7161c8ca2696cb1d212e2cf32b5bb7632584e9adf5e64fccb9557c9b9febf4ddd854207122eb98509d8cb1d5c10c8aff42a03 SHA512 d388d75f4694be743d1a6127984f2fc60dde1333dd23704bc2b84263a24d0a73c8875f237d1e9b887ea524fbdd9d1c22ad2bf466b00fddce0c25a66f557d7107
+DIST lilypond-2.19.64.tar.gz 17174255 BLAKE2B 840b91ff39648e7ad741d1139a2040ee33aa922934a7bf891649ea99cf4aa95b0e82a98421e154cae3fb617ac8b38dc412e072206e3437e770801fe91ab914a3 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9
+DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6
+EBUILD lilypond-2.18.2-r3.ebuild 3229 BLAKE2B a4c2d4fc7c1cb5f671c05b3e192cc4f3b4ab71ce4b914e339c7f7011cbeda4d721acee2bf1932d4b7797cc16a802daa770366cda69918c192ea148df1799e839 SHA512 bc8734666926410472dbcbcdfc1c9f1fa6482accbb94a2d47eab478e1cfe28f8bb026968d7012c3d0d0aa875765e2a8d212df33100e7ce63ee32bee226a24ac8
 EBUILD lilypond-2.19.54.ebuild 3416 BLAKE2B 3e75bae5a0c65715ee08c277fc175ea95ae8fccd44706571ee3d9c9dffc2eb0be339e9861fa756fba00cc41e4263b244466bdc3d368621e28d19c3ee8f43df10 SHA512 7a36abc1dc63e2d0d2a3c7a5befab55786211ec55e7c35caf5cc3a6eb456b1bd1db9fe4b66f29c2aa7f9bee15c685a08c70feccb3d06de6e19a7b3fab39b1a20
-EBUILD lilypond-2.19.61.ebuild 3423 BLAKE2B a13fdbe1a6b747444f22463736206cc2d20ff22cc657f8977f95c17004404b9e630528737835b612bb6668952fd04500ecdb45b55643a6f0e65a65e4b15cdd3f SHA512 72295001f330d68d7a3aed4f33dcbfcdc49fae897c862da764a943ba254469935707f03d18680566aea1249771070ae6ae921e658ad3bbae3161bfa2632b8242
-EBUILD lilypond-2.19.63.ebuild 3423 BLAKE2B a13fdbe1a6b747444f22463736206cc2d20ff22cc657f8977f95c17004404b9e630528737835b612bb6668952fd04500ecdb45b55643a6f0e65a65e4b15cdd3f SHA512 72295001f330d68d7a3aed4f33dcbfcdc49fae897c862da764a943ba254469935707f03d18680566aea1249771070ae6ae921e658ad3bbae3161bfa2632b8242
 EBUILD lilypond-2.19.64.ebuild 3423 BLAKE2B a13fdbe1a6b747444f22463736206cc2d20ff22cc657f8977f95c17004404b9e630528737835b612bb6668952fd04500ecdb45b55643a6f0e65a65e4b15cdd3f SHA512 72295001f330d68d7a3aed4f33dcbfcdc49fae897c862da764a943ba254469935707f03d18680566aea1249771070ae6ae921e658ad3bbae3161bfa2632b8242
-EBUILD lilypond-9999.ebuild 3423 BLAKE2B a13fdbe1a6b747444f22463736206cc2d20ff22cc657f8977f95c17004404b9e630528737835b612bb6668952fd04500ecdb45b55643a6f0e65a65e4b15cdd3f SHA512 72295001f330d68d7a3aed4f33dcbfcdc49fae897c862da764a943ba254469935707f03d18680566aea1249771070ae6ae921e658ad3bbae3161bfa2632b8242
+EBUILD lilypond-2.19.80.ebuild 3423 BLAKE2B e662df69a672d1c3f32cad8245d4068d9cbe160709cc4fc4177f40edfb67fb4bf2ef8d273e8bf259fdd4d75831fe3f45ddc58d5994da5bb29b2df14e7d1f3abb SHA512 2182071dc9e0a0cdaa446af6f24593e27f9709893acc9ea91629c76d1fb76e91f17f5b8f1b85c0f352d10a77562eb12117fe2097e088ae419eb4d95a95385ec0
+EBUILD lilypond-9999.ebuild 3435 BLAKE2B afb446ff41e90d4fb2ded54d0854d30c7cca89a50fbcdc1a159b38444c033f2e127a9189811f1e8c04682842ceb76e38e390ecad11281ae91e2d3444a970fbe5 SHA512 0205ed0916234ea036b527ccc8e0b086f143a73282aabe3d7a92bd196ad5638058e1ec6318f027f8a71327231cae6858843b4f1f75b674705badd004de07edf1
 MISC metadata.xml 861 BLAKE2B c7214caf915ce8f32dad9cd6f08c72bb42490de9f679f073bb6e68c6f14e209f6b3013554fc786d3fb765d271bbb39d54ecdc4df2967700507ab0c9f782d4621 SHA512 d20e7dc27a7836585c7ca28cb78c073c3767a1749d16bca3989bb552d4920e949b3caf36f2227862655e61be0914602aa3af41f17a0f61246b3f305228c9b70c
diff --git a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
index 4afc18c6e1d6..ee3ea59a82a8 100644
--- a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
+++ b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -80,7 +80,7 @@ src_prepare() {
 	done
 
 	# respect AR
-	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+	sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die
 
 	# remove bundled texinfo file (fixes bug #448560)
 	rm tex/texinfo.tex || die
diff --git a/media-sound/lilypond/lilypond-2.19.63.ebuild b/media-sound/lilypond/lilypond-2.19.63.ebuild
deleted file mode 100644
index 5dd683dc4186..000000000000
--- a/media-sound/lilypond/lilypond-2.19.63.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-[[ "${PV}" = "9999" ]] && inherit git-r3
-inherit elisp-common autotools python-single-r1 xdg-utils
-
-if [[ "${PV}" = "9999" ]]; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
-else
-	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
-fi
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-SLOT="0"
-LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
-IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/ghostscript-gpl-8.15
-	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
-	media-fonts/tex-gyre
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=x11-libs/pango-1.12.3
-	emacs? ( virtual/emacs )
-	guile2? ( >=dev-scheme/guile-2:12 )
-	!guile2? (
-		>=dev-scheme/guile-1.8.2:12[deprecated,regex]
-		<dev-scheme/guile-2.0:12
-	)
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/t1utils
-	dev-lang/perl
-	dev-libs/kpathsea
-	>=dev-texlive/texlive-metapost-2013
-	|| (
-		>=app-text/texlive-core-2013
-		>=dev-tex/metapost-1.803
-	)
-	virtual/pkgconfig
-	media-gfx/fontforge[png]
-	>=sys-apps/texinfo-4.11
-	>=sys-devel/bison-2.0
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/make"
-
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-DOCS=( DEDICATION HACKING README.txt ROADMAP )
-
-pkg_setup() {
-	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
-	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
-		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
-			einfo "Updating metapost symlink"
-			eselect mpost update || die
-		fi
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if ! use vim-syntax ; then
-		sed -i 's/vim//' GNUmakefile.in || die
-	fi
-
-	# respect CFLAGS
-	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
-
-	for lang in ${LANGS}; do
-		use linguas_${lang} || rm po/${lang}.po || die
-	done
-
-	# respect AR
-	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
-
-	# remove bundled texinfo file (fixes bug #448560)
-	rm tex/texinfo.tex || die
-
-	eautoreconf
-
-	xdg_environment_reset #586592
-}
-
-src_configure() {
-	# documentation generation currently not supported since it requires a newer
-	# version of texi2html than is currently in the tree
-
-	local myeconfargs=(
-		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--disable-documentation
-		--disable-optimising
-		--disable-pipe
-		$(use_enable debug debugging)
-		$(use_enable guile2)
-		$(use_enable profile profiling)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
-			|| die "elisp-compile failed"
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
-
-	# remove elisp files since they are in the wrong directory
-	rm -r "${ED}"/usr/share/emacs || die
-
-	if use emacs ; then
-		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-	fi
-
-	python_fix_shebang "${ED}"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/media-sound/lilypond/lilypond-2.19.61.ebuild b/media-sound/lilypond/lilypond-2.19.80.ebuild
index 5dd683dc4186..3fae42dbe7e2 100644
--- a/media-sound/lilypond/lilypond-2.19.61.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.80.ebuild
@@ -85,7 +85,7 @@ src_prepare() {
 	done
 
 	# respect AR
-	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+	sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die
 
 	# remove bundled texinfo file (fixes bug #448560)
 	rm tex/texinfo.tex || die
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 5dd683dc4186..e451c38deeb9 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit elisp-common autotools python-single-r1 xdg-utils
 
 if [[ "${PV}" = "9999" ]]; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
 else
 	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
@@ -85,7 +85,7 @@ src_prepare() {
 	done
 
 	# respect AR
-	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+	sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die
 
 	# remove bundled texinfo file (fixes bug #448560)
 	rm tex/texinfo.tex || die
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 49b8b0a4defa..4d06295fb74f 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,4 +1,6 @@
 DIST lmms-1.1.90.tar.gz 16580373 SHA256 007a4b7a6c7c09bd9e4262af0f03aafb8f0e4a627d88cfa80b845202f675cc4b SHA512 4e8bc4ec70c613b69ff14e463860e6f86236cb7b238529d41c4e9cc1b9642590110d1d07f87b9e2a4e139454c3a1f851f95a5eaef12e95660b50dd6ea17aa486 WHIRLPOOL 495de690f69d2e00c7d2f99e81384e189bf235aec6911f94029be984552856be3aa19f1a5f66293e97deadacc22dbd3cbbc0d2d7a42e7111484edf9d65c196fa
+DIST lmms-1.2.0_rc4.tar.gz 16596115 BLAKE2B ec8a132f900417749899b084915d31348e267aebcded218d919559f195ce4826091bc3576932d2fa9115c2e040ba73b84db05eeaca3fbcf33b930791241de990 SHA512 8f102f2a4f157da1b8477d4f73bd5b86e7d11453491f6764deed1c61654c0836e612e19d1dac33d154ed9d1b0a0c65084a0537be832c94e72b904264269b6a96
 EBUILD lmms-1.1.90.ebuild 2027 BLAKE2B aa4f244249985e952f2f277a4a776c9b1deffb6bc094cb87478f9977438c48874ae94fcca5ee2533260ba548786a089d464414ad2caab52ca2c7954fe97c108f SHA512 9fd56eeaf6bcbd7c28a093166e0d462e550a48eebaf64fe0f13eabefe9804d22e6836714ad76000a1a9fb3ba4da44fd707c5e9df0fafa84477b86a10b20a731c
-EBUILD lmms-9999.ebuild 2027 BLAKE2B aa4f244249985e952f2f277a4a776c9b1deffb6bc094cb87478f9977438c48874ae94fcca5ee2533260ba548786a089d464414ad2caab52ca2c7954fe97c108f SHA512 9fd56eeaf6bcbd7c28a093166e0d462e550a48eebaf64fe0f13eabefe9804d22e6836714ad76000a1a9fb3ba4da44fd707c5e9df0fafa84477b86a10b20a731c
+EBUILD lmms-1.2.0_rc4.ebuild 2222 BLAKE2B ad90d8f65b53d7f6ea0c4767a4903906aec3bea81d0e5b4f3f30a8009db618d480098c5b1d0230e1d4c3810d3c7799e19967bae4e08f555e7891a0d37b4126de SHA512 9ab23a637fdc8b2c363018cbbdb50a9223f4271d46860a633c88a648b22a224df9e7dd9546981afbb1515f1d6a2a405c33c53301642322ba8250f67d4d0f90e1
+EBUILD lmms-9999.ebuild 2222 BLAKE2B ad90d8f65b53d7f6ea0c4767a4903906aec3bea81d0e5b4f3f30a8009db618d480098c5b1d0230e1d4c3810d3c7799e19967bae4e08f555e7891a0d37b4126de SHA512 9ab23a637fdc8b2c363018cbbdb50a9223f4271d46860a633c88a648b22a224df9e7dd9546981afbb1515f1d6a2a405c33c53301642322ba8250f67d4d0f90e1
 MISC metadata.xml 956 BLAKE2B 0146d8de32c1f9aaa1b111f10e48de20bde5e3634527b4da37ec14d2a148e6eb974bf6665e4fe6254732dff28ec24e3ca7fd1d7b860928453a223bd183895715 SHA512 d96540b061f24e031f1cbb381c05f4eb368e207f8300e8b68e57a36deb2bfb6108453e8428e2534e895927a738d74d8692fc918d8456e0f01b5ec971d4400acc
diff --git a/media-sound/lmms/lmms-1.2.0_rc4.ebuild b/media-sound/lmms/lmms-1.2.0_rc4.ebuild
new file mode 100644
index 000000000000..1782844e67f4
--- /dev/null
+++ b/media-sound/lmms/lmms-1.2.0_rc4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Cross-platform music production software"
+HOMEPAGE="https://lmms.io"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/LMMS/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+
+IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	>=media-libs/libsamplerate-0.1.8
+	>=media-libs/libsndfile-1.0.11
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	>=x11-libs/fltk-1.3.0_rc3:1
+	alsa? ( media-libs/alsa-lib )
+	fluidsynth? ( media-sound/fluidsynth )
+	jack? ( virtual/jack )
+	libgig? ( media-libs/libgig )
+	ogg? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? (
+		media-libs/libsdl
+		>=media-libs/sdl-sound-1.0.1
+	)
+	soundio? ( media-libs/libsoundio )
+	stk? ( media-libs/stk )
+	vst? ( || ( app-emulation/wine virtual/wine ) )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	>=dev-util/cmake-2.4.5
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/ladspa-cmt
+	media-plugins/calf
+	media-plugins/caps-plugins
+	media-plugins/swh-plugins
+	media-plugins/tap-plugins
+"
+
+DOCS=( README.md doc/AUTHORS )
+
+src_configure() {
+	local mycmakeargs+=(
+		-DUSE_WERROR=FALSE
+		-DWANT_SYSTEM_SR=TRUE
+		-DWANT_CAPS=FALSE
+		-DWANT_TAP=FALSE
+		-DWANT_SWH=FALSE
+		-DWANT_CMT=FALSE
+		-DWANT_CALF=FALSE
+		-DWANT_QT5=TRUE
+		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_JACK=$(usex jack)
+		-DWANT_GIG=$(usex libgig)
+		-DWANT_OGGVORBIS=$(usex ogg)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_SDL=$(usex sdl)
+		-DWANT_SOUNDIO=$(usex soundio)
+		-DWANT_STK=$(usex stk)
+		-DWANT_VST=$(usex vst)
+		-DWANT_SF2=$(usex fluidsynth)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index ee2e01679215..1782844e67f4 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils xdg-utils
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -11,8 +11,9 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/LMMS/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/LMMS/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P/_/-}"
 fi
 
 LICENSE="GPL-2 LGPL-2"
@@ -85,3 +86,13 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index a6e29bcaf6a7..dd8ad3bb1414 100644
--- a/media-sound/mp3blaster/Manifest
+++ b/media-sound/mp3blaster/Manifest
@@ -1,9 +1,5 @@
 AUX mp3blaster-3.2.5-fix-build-system.patch 2785 BLAKE2B 85f48a92691a538f01cf36c472d9d94e41a45bc0556e50b5f0375ef31c5aa2d2a44356ab2d732e11c135fac1a58b9e5c4e69a218f2d65663ea098319ad6964a8 SHA512 307796e8967b942f1b8133c271eb2a4a24ac9ce3ef2d3ed144197d615ba801198b4af115439f4306c5b84c5c3b7b4025475ed1dbae992d2731f646636ce8df8f
 AUX mp3blaster-3.2.5-fix-c++14.patch 1206 BLAKE2B 2f007e1af876c70bab2202e628824a7b80ac1d1fddefb805849f7089d342690f4654e67829794bd17eea23c64a60b0a511dcc14d23987f577d69d57ce1d900bf SHA512 cf0fe93ad0e6a75a58a855aae87222de923709a775552138ad95754ced9812a62c3a1cdc4d7091e1b727c0425cec40d223a9533ad4a735efed24d5a62db4e8e4
-DIST mp3blaster-3.2.5.tar.gz 329407 SHA256 129115742c77362cc3508eb7782702cfb44af2463a5453e8d19ea68abccedc29 SHA512 53f623340b7a8e4be6cd973474fd5f23c623b6d1c667478dc0d4c7a1ef5758f4bbc09d9d0698d1539d8d1c3ef45301b447f3ed74f68586070a07a7f9fa8c353e WHIRLPOOL 96cdc3b6436dec282a5836c00e2151dd04f218175fdd2451fcfd45f70bced05dea0c8915cf1a817d24a9961fc8ab3d9c5b568a5ae67e23e2b1915604b2d7806e
 DIST mp3blaster-3.2.6.tar.gz 354019 SHA256 43d9f656367d16aaac163f93dc323e9843c3dd565401567edef3e1e72b9e1ee0 SHA512 eb977eb46b86449c6d433b1740aa08580e5b8f3d55d82d6f2623cd5fd103d73b7df127fb9ac650a21da61ad4948eb569a812e15d9adc9424d491fa625e198e0d WHIRLPOOL d617d9cf9dccd01cda71f31806ad9b5f4a02d94df29befb3d37408e9831c8883c8501050d453f242fe27066b6af47d0fb68242070217f781ca03cb19b3afbe2a
-DIST mp3blaster_3.2.5-3.debian.tar.gz 11000 SHA256 e4d424aeccde6ccd219270f4e4f0bf8f70b97e13075447b6d6d069110ed092c9 SHA512 1d899c85c2a2e1326fac0f87c61ead82273a08c672aeab0929479d9aa10c6ae703bb63c1a6aec14c8f5b6a139089fa5228cf09db72ea5b114efb60a196bd4788 WHIRLPOOL 9c1c99d5a4f4e5060a9eae4e681f0df841d6932f34a12102a82d2e1f795d4db41fd3f15d6aa6a34d04d42259d73ba67f775b24a51df30779d4f4466ded40f69f
-EBUILD mp3blaster-3.2.5-r1.ebuild 1637 BLAKE2B cb35a41abee9e1da6a5902ac03051b4311fa62f46da2b7d232e357e34b06b6345701ea9e506ab2622493ba85bcada86b1d2ce21ee5e44854b10beca0c451476a SHA512 70a0f736b34b33819ae3a28b8e17dd7445c6b3a8ba0b05f35880d10d34d9649e4bfd664079022b0af0ee4eba3c1ca9a2ea1107931936506b3b16f68120a2113a
-EBUILD mp3blaster-3.2.5-r2.ebuild 1643 BLAKE2B ae657d37a2c423666e43cc0126ab7d7877266c4990dca5e01139f35d6085eb127d2d0214d3fd3e8579f594d68fe59ec4f3ab13e24738683fba12ac7359d7f632 SHA512 52587b78745e4253c6d43a42238dfcab79c0807dde7feab13ea3cb01900b07213dbd6eef020aa35de891db05381afd9c64abeba3954bdad0845496ea24628471
-EBUILD mp3blaster-3.2.6.ebuild 1565 BLAKE2B dd02b8332519b8229f28bd00aa4d54ad4c3925673ada0963e30315171b2e373f67e2b099f6c396e55a8415a650fe1a09f2c86d46289e9747459cbded4bff20ad SHA512 b7c4653c118f7b1617a2a38011dde1ed39b09d6ae13e694cf855eb303c0b9f9dfcaea993c95e9e63eaffcf39d96ababe41307b5959de415b2671df93a452a5db
+EBUILD mp3blaster-3.2.6.ebuild 1564 BLAKE2B 93bceb64fc0566e7ea2f54c30b6754be1454e280d0690a5f896350191edfb36dabad8fc6b816e4fb2c884056a7ca2d283faf05e562023f83f7e30e25089d3d82 SHA512 92c4ee037ea81b9a3b8a2a26afdf318a8961e2025898e235b13cf7025c7624fc03732937f0a56da09c4b74097d4b1e51a0d602da48536800882dcace31efb889
 MISC metadata.xml 432 BLAKE2B 61a314b3ec47b80456e1e82bcdb198e073188f7e2f7f75d2156c6826754dbf47748f552a8ecb08577527bdcf2f97739583dac6db5c5bb5f14e2e61e676a6ea0e SHA512 e59462dc17d0e050f0876eb74334ddb5c980900a8b4268c281f92e30545a7cf7a3589dc1961640cba9a01d3ce01ec210904dd7033e42d9b3d237740f6820f375
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
deleted file mode 100644
index 72aa2ae0f695..000000000000
--- a/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Text console based program for playing audio files"
-HOMEPAGE="http://mp3blaster.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://debian/pool/main/m/${PN}/${PN}_${PV}-3.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="lirc oss sdl sid vorbis"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7
-	lirc? ( app-misc/lirc )
-	sdl? ( media-libs/libsdl )
-	sid? ( =media-libs/libsidplay-1* )
-	vorbis? ( >=media-libs/libvorbis-1 )"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-	oss? ( virtual/os-headers )"
-
-REQUIRED_USE="|| ( oss sdl )"
-
-DOCS="AUTHORS BUGS ChangeLog CREDITS FAQ NEWS README TODO"
-
-src_prepare() {
-	EPATCH_SOURCE=${WORKDIR}/debian/patches EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
-	# file collision with media-sound/splay
-	sed -i -e 's:splay.1:splay_mp3blaster.1:' Makefile.in || die
-	mv -vf splay{,_mp3blaster}.1 || die
-}
-
-src_configure() {
-	# libpth and newthreads support are both broken
-	econf \
-		--disable-newthreads \
-		--without-pth \
-		--without-nas \
-		$(use_with lirc) \
-		$(use_with vorbis oggvorbis) \
-		$(use_with sid sidplay) \
-		--without-esd \
-		$(use_with sdl) \
-		$(use_with oss)
-}
-
-src_install() {
-	default
-
-	doman "${WORKDIR}"/debian/manpages/mp3tag.1
-
-	# relocate everything except commands.txt because it's used by src/main.cc
-	mv -vf "${ED}"usr/share/${PN}/{charmap,sample.*} "${ED}"usr/share/doc/${PF} || die
-
-	# file collision with media-sound/splay
-	mv -vf "${ED}"usr/bin/splay{,_mp3blaster} || die
-}
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.5-r2.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.5-r2.ebuild
deleted file mode 100644
index d4545c71cb49..000000000000
--- a/media-sound/mp3blaster/mp3blaster-3.2.5-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Text console based program for playing audio files"
-HOMEPAGE="http://mp3blaster.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://debian/pool/main/m/${PN}/${PN}_${PV}-3.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="lirc oss +sdl sid vorbis"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	lirc? ( app-misc/lirc )
-	sdl? ( media-libs/libsdl )
-	sid? ( media-libs/libsidplay:1 )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-	oss? ( virtual/os-headers )"
-
-REQUIRED_USE="|| ( oss sdl )"
-
-PATCHES=(
-	"${WORKDIR}"/debian/patches
-	"${FILESDIR}"/${PN}-3.2.5-fix-c++14.patch
-	"${FILESDIR}"/${PN}-3.2.5-fix-build-system.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# file collision with media-sound/splay
-	sed -i -e 's:splay.1:splay_mp3blaster.1:' Makefile.in || die
-	mv -vf splay{,_mp3blaster}.1 || die
-}
-
-src_configure() {
-	# libpth and newthreads support are both broken
-	econf \
-		--disable-newthreads \
-		--without-pth \
-		--without-nas \
-		$(use_with lirc) \
-		$(use_with vorbis oggvorbis) \
-		$(use_with sid sidplay) \
-		--without-esd \
-		$(use_with sdl) \
-		$(use_with oss)
-}
-
-src_install() {
-	default
-
-	doman "${WORKDIR}"/debian/manpages/mp3tag.1
-
-	# relocate everything except commands.txt because it's used by src/main.cc
-	mv -vf "${ED%/}"/usr/share/{${PN}/{charmap,sample.*},doc/${PF}} || die
-
-	# file collision with media-sound/splay
-	mv -vf "${ED%/}"/usr/bin/splay{,_mp3blaster} || die
-}
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
index 565272b311e6..cb697b8658f4 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="lirc oss +sdl sid vorbis"
 
 RDEPEND="
diff --git a/media-sound/mpdas/Manifest b/media-sound/mpdas/Manifest
index ca27d55116db..c047da0db870 100644
--- a/media-sound/mpdas/Manifest
+++ b/media-sound/mpdas/Manifest
@@ -5,4 +5,4 @@ DIST mpdas-0.4.2.tar.gz 15695 SHA256 8ebdd0518cbdb033fc0578c9ea894d4670de1d67bf2
 EBUILD mpdas-0.4.0-r1.ebuild 713 BLAKE2B 457d000fb43cfa63a8d897dd9b4ea9c7fab52f9e2b3a875616104a2c5988c78d6bdb43c67a7a8753610dcdd79504f5fa42b077db8a752058ec3f665ab197eade SHA512 6ff9c4c330e1a0cd2da0082469f2c4e194e9861a252f6733c427cb62c85b5e3d8ffd63528439296817614e0f7c9c3e4ee6341106823a5718fedc22f88f82f49c
 EBUILD mpdas-0.4.1.ebuild 715 BLAKE2B 5cdbecdd1167865e850733c2f4bcc7ad598c4bafcba46e35afb17e8ddf941ae2137d9e192c5212ce1bbce5c9d58376acd1d808e768551ece2f3c2b786d304ba4 SHA512 79b9bc6753ae2d6a19c07b72ea4d2848b4d34a5e94033c28b8c7aa75e32145903d715c70da3e7ac2c24095e5d43a8ef60b8ce12f764cb20ed7853ca8cc02b7af
 EBUILD mpdas-0.4.2.ebuild 778 BLAKE2B 4bdb9e54ddce763ce23ab8c70ae68943d3f1e96e5ce268c196b12b0a03c3b1b88ed01be6febfeb5dd0be33641e4ccb345974e7b6b57e94633cd0dffcc37c9df1 SHA512 f562d8c3cfb343cbb032849e158c890f920727b7c25116dcdfc17de0695e934cbf05cbf8113a472a9a27fb911d28f4a3a9383f12e5ba9bf3ab32f774897c6ccb
-MISC metadata.xml 255 BLAKE2B d6b4c26d52e5bba7ef81930401b90714ac7e9c8d286afe878e08c971a0ba9524ea06331677f40422990dcb4891474da3348dda1ac8f31efa5b1e8170792fdb2e SHA512 01c6975548c91a866643b9606aded004372568c8f3e30abaf683f9f77221d15c7b3f304103ef8aeaad415326ab3e9e2bca6b71a1ff39f2835dc680e112e75687
+MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/mpdas/metadata.xml b/media-sound/mpdas/metadata.xml
index 61852ad99397..ee7258ac28eb 100644
--- a/media-sound/mpdas/metadata.xml
+++ b/media-sound/mpdas/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  	<email>sound@gentoo.org</email>
-  	<name>Gentoo Sound project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 9d01e3f8a1b8..fdd3267ee536 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -5,4 +5,4 @@ EBUILD ncmpcpp-0.7.7.ebuild 1501 BLAKE2B b4fac49d9ebca61da51109aa52b06a14f500506
 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
-MISC metadata.xml 1174 BLAKE2B 2b267327a859d8ad1db14e64fdeabb6123c6109331df0575bdc13eedc9898959ab83989ecf4e178a1d91d6c93c82763dc724fe67e616a39aa441b22bac58db0e SHA512 4c212ee37621f97c0519a842878764a6fe8c44b17af68747cbfb6965cf5419b00c87bfe11a01b6964e4c5f6818acdc583c277c5cab81bd0de392ef4945a5523f
+MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d
diff --git a/media-sound/ncmpcpp/metadata.xml b/media-sound/ncmpcpp/metadata.xml
index b19eb817aa0f..bc38f1746074 100644
--- a/media-sound/ncmpcpp/metadata.xml
+++ b/media-sound/ncmpcpp/metadata.xml
@@ -11,26 +11,25 @@
 	<use>
 		<flag name="clock">Enable clock screen</flag>
 		<flag name="outputs">Enable outputs screen</flag>
-		<flag name="visualizer">Enable visualizer screen with sound wave/frequency
-			spectrum modes</flag>
+		<flag name="visualizer">Enable visualizer screen with sound wave/frequency spectrum modes</flag>
 	</use>
 	<longdescription lang="en">
-	A featureful <pkg>sys-libs/ncurses</pkg> based <pkg>media-sound/mpd</pkg>
-	client inspired by <pkg>media-sound/ncmpc</pkg>
+		A featureful <pkg>sys-libs/ncurses</pkg> based <pkg>media-sound/mpd</pkg>
+		client inspired by <pkg>media-sound/ncmpc</pkg>
 
-	Ncmpcpp is very similar to ncmpc if it comes to user interface, but it
-	provides a lot of new useful features. 
+		Ncmpcpp is very similar to ncmpc if it comes to user interface, but it
+		provides a lot of new useful features.
 
-	Main new features:
-	 * tag editor
-	 * playlist editor
-	 * easy to use search engine
-	 * media library
-	 * music visualizer
-	 * ability to fetch artist info from last.fm
-	 * new display mode
-	 * alternative user interface
-	 * ability to browse and add files from outside of MPD music directory
-	 ..and a lot more minor convenient functions.
+		Main new features:
+		* tag editor
+		* playlist editor
+		* easy to use search engine
+		* media library
+		* music visualizer
+		* ability to fetch artist info from last.fm
+		* new display mode
+		* alternative user interface
+		* ability to browse and add files from outside of MPD music directory
+		..and a lot more minor convenient functions.
 	</longdescription>
 </pkgmetadata>
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index dacf0bdd79ff..78b46faab3bd 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -4,4 +4,4 @@ DIST pasystray-0.6.0.tar.gz 53835 SHA256 44383b38fdafbbcb05d212b4f374c57a263f627
 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 730 BLAKE2B 15c531b1d564fe686ce443c0ec65fea74991045a15aeab1637a4d9f0be2fc526266f1b8e91d41ea09aa88a9fdd17f813ff2725664d5c1484110777e9e13ac197 SHA512 18850c548477a5871ce9ea07a3a8a4711654d3b5fec4faec985547c44f42e16f183f1c130766aa3a1e7caff4fa18459f8f5ac7c58bd22581409e2d14a8791d4d
+MISC metadata.xml 681 BLAKE2B 91dc121d11678d0385f9dd68c5153a587c864c3f1623d8bc2b332d9fa6262eeb6faf127ac14eb6060fdb089e22316e33fe699fc109ef873e0829e2e191ae1c1d SHA512 bd6780d171a849af150404f3910545f45c2e47acfb8fe705fb5163a93c5cbe728fb61b7252705a2d44846ca85630137945982f0927cd043abbdff81c2053f392
diff --git a/media-sound/pasystray/metadata.xml b/media-sound/pasystray/metadata.xml
index 2499ed091c18..778defeed5a7 100644
--- a/media-sound/pasystray/metadata.xml
+++ b/media-sound/pasystray/metadata.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-        	<email>lmiphay@gmail.com</email>
-	        <name>Paul Healy</name>
-	        <description>Proxy maintainer</description>
+		<email>lmiphay@gmail.com</email>
+		<name>Paul Healy</name>
+		<description>Proxy maintainer</description>
 	</maintainer>
 	<maintainer type="project">
-        	<email>sound@gentoo.org</email>
-        	<name>Gentoo Sound project</name>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
 	</maintainer>
 	<maintainer type="project">
-        	<email>proxy-maint@gentoo.org</email>
-        	<name>Proxy Maintainers</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">christophgysin/pasystray</remote-id>
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
new file mode 100644
index 000000000000..f290a052e57f
--- /dev/null
+++ b/media-sound/pulseeffects/Manifest
@@ -0,0 +1,6 @@
+DIST pulseeffects-3.0.8.tar.gz 604530 BLAKE2B e55b08a861f8a9b45191727d000b28b6468d1d46328726ef30f63733bf6b3dd6b745d3f4c38f54c5924950c489c70bb87b57ada4735ce68420d678e93019da65 SHA512 2610b19c0a61510ab9ab29d2fb038a76dcdaf6c168f57d13df8baf32493cf2fe56cfad73f862144117ce511864b405c9d78f294afcab6bc4336ffc234e18110b
+DIST pulseeffects-3.0.9.tar.gz 614347 BLAKE2B ab24d1af31b359348de8de235694100be20cf961c358b63a043670f82efa17afe25b0cf9e723c6be228bd70af2ce0bc91176f6371a549799a4c7921f2fcf7368 SHA512 aad31f042ff1f1e15c50f2a7a63f73b3878fad56101e0fabb51ed2e48500451b401ece8db56c23049ac4455deb481ba0c0586aa9a753581acdb3749a219046f4
+EBUILD pulseeffects-3.0.8.ebuild 1382 BLAKE2B ad31d639425ff10f8498e9691a5986e75baa5bd588d1b052355e90d29cd6bd3ab49af8ee59f8a82d43c9421ca7ad3f741e6f5e3ea67e2149f99cd1f2f9335750 SHA512 4c42030986e7830ef22986a5544966d6ac8cd9ae14f882351703dcf5707c101fd31a4b96d956ce71c51e85836d6779ff7f45d01aaeb02d85d1e4f97a25fee449
+EBUILD pulseeffects-3.0.9.ebuild 1382 BLAKE2B ad31d639425ff10f8498e9691a5986e75baa5bd588d1b052355e90d29cd6bd3ab49af8ee59f8a82d43c9421ca7ad3f741e6f5e3ea67e2149f99cd1f2f9335750 SHA512 4c42030986e7830ef22986a5544966d6ac8cd9ae14f882351703dcf5707c101fd31a4b96d956ce71c51e85836d6779ff7f45d01aaeb02d85d1e4f97a25fee449
+EBUILD pulseeffects-9999.ebuild 1382 BLAKE2B ad31d639425ff10f8498e9691a5986e75baa5bd588d1b052355e90d29cd6bd3ab49af8ee59f8a82d43c9421ca7ad3f741e6f5e3ea67e2149f99cd1f2f9335750 SHA512 4c42030986e7830ef22986a5544966d6ac8cd9ae14f882351703dcf5707c101fd31a4b96d956ce71c51e85836d6779ff7f45d01aaeb02d85d1e4f97a25fee449
+MISC metadata.xml 607 BLAKE2B b9f1bd8b2afd83f2e07b1d5a3c1a82fd1ff7de67182316d868890375b1144edf292181c702fa274da87bd0cc43a5e967ed6f379d0e85764a31834a4ddb3c8c8e SHA512 fa5780c3149aad1d3c5edf76356d521942a85271576f868598c54a7010cf3d31366ad08aa80402479addf8f69111973e7e814abc2df17ea7d0273a5e2a749ac2
diff --git a/media-sound/pulseeffects/metadata.xml b/media-sound/pulseeffects/metadata.xml
new file mode 100644
index 000000000000..c9003b7aa9b2
--- /dev/null
+++ b/media-sound/pulseeffects/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>jpizarrocallejas@gmail.com</email>
+		<name>Jorge Pizarro Callejas</name>
+		<description>Jorgicio Gentoo Overlay</description>
+	</maintainer>
+	<longdescription lang="en">
+		Audio effects for Pulseaudio applications
+	</longdescription>
+	<upstream>
+		<remote-id type="github">wwmm/pulseeffects</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/pulseeffects/pulseeffects-3.0.8.ebuild b/media-sound/pulseeffects/pulseeffects-3.0.8.ebuild
new file mode 100644
index 000000000000..47a858b30f69
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-3.0.8.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 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}"
+	KEYWORDS=""
+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/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-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-3.0.9.ebuild b/media-sound/pulseeffects/pulseeffects-3.0.9.ebuild
new file mode 100644
index 000000000000..47a858b30f69
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-3.0.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 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}"
+	KEYWORDS=""
+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/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-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
new file mode 100644
index 000000000000..47a858b30f69
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 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}"
+	KEYWORDS=""
+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/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-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/qmidiarp/Manifest b/media-sound/qmidiarp/Manifest
index 47c762e9757b..26646a10c755 100644
--- a/media-sound/qmidiarp/Manifest
+++ b/media-sound/qmidiarp/Manifest
@@ -2,4 +2,4 @@ DIST qmidiarp-0.6.3.tar.bz2 541646 SHA256 10f5f4784cb3d0e131978f455bff57bf82fae7
 DIST qmidiarp-0.6.4.tar.bz2 537804 SHA256 1d96536927ce71691ae6fe779f627b277cfa0373341669ec9a06b92715da6ebe SHA512 06f3dc52c6673f452af4d5c5f4d2efc50fbe16b8fe792cb9d115f9efa124224e0131e763d31ee60cee68b78d952061e69976a09fa3118b23362ea3cea76260d0 WHIRLPOOL e04e64725e1efb4e772b62f6c030a61370f9447f61989fb5615dfee778f46c5036231f97f0518fa6750278875cd3003d3ebf667736fa026a550d8a561ed0f74b
 EBUILD qmidiarp-0.6.3-r1.ebuild 809 BLAKE2B 941243d34ac4b9b7c1fe34381c3973fb01deaa32c5b844d211cfdbe9353e99e31200fb7c8cbf1e41c7ac48674f5aac668ecbb49d45cdb61289b2a18c84f5b17c SHA512 0666a61d00394ebb68a607ab6b48dd2ccc2fbecc06eaf7a89a262991ff8f2a6d87b6548a60895e64d9dc0359b62fc96d5b7b884d513276f827b689991358b5e2
 EBUILD qmidiarp-0.6.4-r1.ebuild 809 BLAKE2B 86f13fa0db245e4a74bd07bffc96b5a2b092ef91f3fa4c785d6f65894e42ae63b384a2c19dc6d24b2ee49798351ce94b60678c693337c30ed1867ff6910bf806 SHA512 2dcf33ab68419ef2afe2dd170169a6d3f73ac088ca43bd1c5b6bbd7a16c2a73a3d31122fa961e5df2ef6bcc8101a1d60952f660754c48e0b3dd75e54d824016b
-MISC metadata.xml 408 BLAKE2B 5184a63a843a866ea6b123a87177829e31fcd5a4538bd7c4de719e91edd010eacae95394a59dff8d35a0dea417cd55470e69c945f039b70fa7c346f64ada9d71 SHA512 cf1e13b22bdedf6b677d3aee84e5f0aed7a295dc641587c2829b0a95b15c775fcf99651452db1d04b3a8999fd907963c874fe13400c81d528716fcd06fa10f87
+MISC metadata.xml 399 BLAKE2B 5c11c34be94abf2b8497e14bdffcc16baf402efe2fe4645dec9b61524fe06e92245eb75d93e519074a172f45bd2ae43a1c4963c2ea82cda6cbc6f46d2534d76d SHA512 5db8b45e29ca3273d2ee4f61d4b3ee356ec361fa241eaab4b8d77193bed588b36db6d8184b99f3333061c254854f2ebee42301c66e755943d7b126b8465bc7fc
diff --git a/media-sound/qmidiarp/metadata.xml b/media-sound/qmidiarp/metadata.xml
index 73b19701a760..0fa01de6dce3 100644
--- a/media-sound/qmidiarp/metadata.xml
+++ b/media-sound/qmidiarp/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qmidiarp</remote-id>
 	</upstream>
-  <use>
-    <flag name="lv2">Enables Ladspa V2 plugins.</flag>
-  </use>
+	<use>
+		<flag name="lv2">Enables Ladspa V2 plugins.</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 139c7dee9d8f..8e760f816b58 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,8 +1,8 @@
-DIST qmmp-1.1.10.tar.bz2 1142444 SHA256 1e5781bf65b3a27dd5e21349ac007464e67861dda99f8a0206984687881e0b9a SHA512 f9945ea428265c900751dd692e25eb0618e162e621bda7ab5f0f77d504aee66fa06390edca0155d18ca041706f461dcb9bb20678eaf32250b766e0f593915356 WHIRLPOOL 1beaa2339fa8b86c79876774a3da12a8a5a62bf729e4fd6bd6896aa225bc573dc2272cc7438b257fe6567c8c85f38a301f2740eef788322e1d872404e5db6c0c
 DIST qmmp-1.1.12.tar.bz2 1147871 BLAKE2B e511b02c38cbc5fcb478585df14a50c9f67985da9ef5e1e11557f2acbbd454d1b1beb430c8e2e2725a7d9ceea63243746fd41ecf2970fd3c52bcf21857bc1228 SHA512 a45680dcee478a7f03a04dbc87525368ac227a9de7e803252470f517027639d3426bf27a3235996d94ad68212596c03e7a67b5ad00a642532f02a820bf4097ee
 DIST qmmp-1.1.7.tar.bz2 1135005 SHA256 464f79d9a54e6456c5abcb570d7f062e48d3eaa3d60ad2b09c58bc62af5b87a7 SHA512 058187d34b848c0917077a167bcb52c63e39b5150409295ea658484d99fcd5582f7871979d3d3eea40aa97f0d9bf2a2d72ae721b827bcc0366b1bbc652aa3a72 WHIRLPOOL 1c1f22a22329619f63a1a24590b41b352d398bb4653117c81918b2e940e887c6aaa06f178674a97893de7418673022bdc800a09643d3fb38096f6dc78b7774c3
-EBUILD qmmp-1.1.10.ebuild 3860 BLAKE2B 3ff315969c52877dfd02651bee97b01ba72ab00383a20f6183ad823e0242b3d4676bcc3d28c6a4c33c1c4a64810757f09d1add8b14d656354ddc81ae88ed19a3 SHA512 cb3b6e484f7f63f6659937362ad090a0534c759f4bcdffe9b8aa1161d1a3733bf3dc2b781bbe8650fdeba88d1b52a1f3db7fe0da0206c9137f161dc7bd99ff1f
+DIST qmmp-1.2.0.tar.bz2 1182024 BLAKE2B 0dc471b053a68ddd1f4e5e09d37776712a7c3f323f801920e34843df54a188c9bc5edfeade5791be67177bb9b7a9435ab41763b156d068522db654d9c5a51809 SHA512 63b3a499efa1886d2bb0da093ab5b495a147a0d9ad23780780fd85011ae571179d71dc4222efab39609fe59ec25b9b62d907c8d10decd7fddb73220d963dcf57
 EBUILD qmmp-1.1.12.ebuild 3860 BLAKE2B 3ff315969c52877dfd02651bee97b01ba72ab00383a20f6183ad823e0242b3d4676bcc3d28c6a4c33c1c4a64810757f09d1add8b14d656354ddc81ae88ed19a3 SHA512 cb3b6e484f7f63f6659937362ad090a0534c759f4bcdffe9b8aa1161d1a3733bf3dc2b781bbe8650fdeba88d1b52a1f3db7fe0da0206c9137f161dc7bd99ff1f
 EBUILD qmmp-1.1.7-r1.ebuild 3858 BLAKE2B 544e062718ea06fb28e0920ef7d4c1ee1fa8ad850248a956df78054f1f63b06538af04cd8b09fb5f059af5748ce2530f8fb72dc33f902b1c6b5cfab9c8d62c28 SHA512 88a97842bd3b8f43409c420d391421845a45ce597e9334a6218b13bd36ce18dcc510f82dbe67f175e88ed8da5c8bb28eb3a526c0499f828041fadc9b6c3ba22a
-EBUILD qmmp-9999.ebuild 3860 BLAKE2B 3ff315969c52877dfd02651bee97b01ba72ab00383a20f6183ad823e0242b3d4676bcc3d28c6a4c33c1c4a64810757f09d1add8b14d656354ddc81ae88ed19a3 SHA512 cb3b6e484f7f63f6659937362ad090a0534c759f4bcdffe9b8aa1161d1a3733bf3dc2b781bbe8650fdeba88d1b52a1f3db7fe0da0206c9137f161dc7bd99ff1f
-MISC metadata.xml 1709 BLAKE2B 968e69c85cc59af9c4565d69ebd223fc33bb20804c33763c52a6cfa0e1cd8d4f315c4f4729af61f3b49f3444b7adb38668bd4cb7120537c2da79a17a89a217d6 SHA512 256eb3be8f8a455a54a93c72975b5aec45700258913c9f92d3d4098ee64027bca2862ff9371649a5f429a42ae838f9955354836f4fc002606959ae18bfe65016
+EBUILD qmmp-1.2.0.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
+EBUILD qmmp-9999.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
+MISC metadata.xml 1888 BLAKE2B 32fdf16e8d12c830b72d46d887c9573f583c83c69a405ebb32bb9ac6b46f2100fd29b78241e0982df54fac2b2f7f9ee0e53f56d5f06e388f177514a427ad10ad SHA512 8d17a27caa187aca78e9fbbd64a6226a4055232a39f68e8b211ec8d4062343885e2c4efd47a551e157fbb1cb674cefb3be26c645223e68a57e0b75e4b3a40fe0
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index 472f2398ac72..3a54863df655 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="analyzer">Enable visual analyzer</flag>
+		<flag name="archive">Enable archiving plugin via <pkg>app-arch/libarchive</pkg>.</flag>
 		<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
 		<flag name="cover">Enable album cover support</flag>
 		<flag name="crossfade">Enable crossfade effect when switching tracks</flag>
@@ -27,6 +28,7 @@
 		<flag name="qsui">Enable QMMP simple UI</flag>
 		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="scrobbler">Enable audioscrobbler/last.fm support</flag>
+		<flag name="shout">Enable shoutcast plug-in via <pkg>media-libs/libshout</pkg>.</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 		<flag name="soxr">Use the SoX resampling library</flag>
 		<flag name="stereo">Enable stereo effect</flag>
diff --git a/media-sound/qmmp/qmmp-1.1.10.ebuild b/media-sound/qmmp/qmmp-1.2.0.ebuild
index f3b0a524c058..f7eff28d1dbe 100644
--- a/media-sound/qmmp/qmmp-1.1.10.ebuild
+++ b/media-sound/qmmp/qmmp-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils xdg-utils
 [[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
@@ -12,18 +12,22 @@ if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
-	QMMP_DEV_BRANCH="1.1"
+	QMMP_DEV_BRANCH="1.2"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
-IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome
-jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler sid sndfile soxr stereo tray udisks +vorbis wavpack"
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
+gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
-REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )"
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -35,6 +39,7 @@ RDEPEND="
 	x11-libs/libX11
 	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
 	bs2b? ( media-libs/libbs2b )
 	cdda? (
 		dev-libs/libcdio:=
@@ -70,8 +75,9 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
 	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )
+	shout? ( media-libs/libshout )
 	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
 	soxr? ( media-libs/soxr )
 	udisks? ( sys-fs/udisks:2 )
 	vorbis? (
@@ -101,6 +107,7 @@ src_configure() {
 		-DUSE_AAC="$(usex aac)"
 		-DUSE_ALSA="$(usex alsa)"
 		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
 		-DUSE_BS2B="$(usex bs2b)"
 		-DUSE_CDA="$(usex cdda)"
 		-DUSE_COVER="$(usex cover)"
@@ -111,6 +118,7 @@ src_configure() {
 		-DUSE_MPRIS="$(usex dbus)"
 		-DUSE_ENCA="$(usex enca)"
 		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
 		-DUSE_FLAC="$(usex flac)"
 		-DUSE_GME="$(usex game)"
 		-DUSE_GNOMEHOTKEY="$(usex gnome)"
@@ -132,6 +140,7 @@ src_configure() {
 		-DUSE_QSUI="$(usex qsui)"
 		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
 		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
 		-DUSE_SID="$(usex sid)"
 		-DUSE_SNDFILE="$(usex sndfile)"
 		-DUSE_SOXR="$(usex soxr)"
@@ -144,3 +153,11 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index f3b0a524c058..f7eff28d1dbe 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils xdg-utils
 [[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
@@ -12,18 +12,22 @@ if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
-	QMMP_DEV_BRANCH="1.1"
+	QMMP_DEV_BRANCH="1.2"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
-IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome
-jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler sid sndfile soxr stereo tray udisks +vorbis wavpack"
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
+gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
-REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )"
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -35,6 +39,7 @@ RDEPEND="
 	x11-libs/libX11
 	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
 	bs2b? ( media-libs/libbs2b )
 	cdda? (
 		dev-libs/libcdio:=
@@ -70,8 +75,9 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
 	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )
+	shout? ( media-libs/libshout )
 	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
 	soxr? ( media-libs/soxr )
 	udisks? ( sys-fs/udisks:2 )
 	vorbis? (
@@ -101,6 +107,7 @@ src_configure() {
 		-DUSE_AAC="$(usex aac)"
 		-DUSE_ALSA="$(usex alsa)"
 		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
 		-DUSE_BS2B="$(usex bs2b)"
 		-DUSE_CDA="$(usex cdda)"
 		-DUSE_COVER="$(usex cover)"
@@ -111,6 +118,7 @@ src_configure() {
 		-DUSE_MPRIS="$(usex dbus)"
 		-DUSE_ENCA="$(usex enca)"
 		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
 		-DUSE_FLAC="$(usex flac)"
 		-DUSE_GME="$(usex game)"
 		-DUSE_GNOMEHOTKEY="$(usex gnome)"
@@ -132,6 +140,7 @@ src_configure() {
 		-DUSE_QSUI="$(usex qsui)"
 		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
 		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
 		-DUSE_SID="$(usex sid)"
 		-DUSE_SNDFILE="$(usex sndfile)"
 		-DUSE_SOXR="$(usex soxr)"
@@ -144,3 +153,11 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/rgain/Manifest b/media-sound/rgain/Manifest
index c56a7e59d3f8..4d1887773a4f 100644
--- a/media-sound/rgain/Manifest
+++ b/media-sound/rgain/Manifest
@@ -1,3 +1,3 @@
 DIST rgain-1.2.1.tar.gz 24741 SHA256 041b4217d506937a7199ed3a406387760f06db38fef817f1aee883af24eb5e32 SHA512 ac9a0c9918e55150d34b07dfbe839a0e497f8c5793ecbaad4f35063f2e00e0ebd1cb9739c5d0022513c2fe9b0aa880941ba848d791a4db31373ad0d421a133df WHIRLPOOL bb2288eda097ff2963c888eb910813a62becf6bdcec777bf324b93cf1ab9f54104251ca154d6c1504639580319e56b2bff55e94bea4ea23ab1bfd253d6a4063d
 EBUILD rgain-1.2.1.ebuild 857 BLAKE2B 5ac19f5fd9b04da92f072456b3f0873886cc1fc42fce9ea74e91842aca779a1c94ba0c46a3af08ff43dd2e1eb5a534cb70fcefaa37684876a8a7ea1338351367 SHA512 c9ca1e9ae6a9ce1cd60714543d7bbfacb6bef8096f9eb7fba46051bf2a2dfd57bc66bd7c93799667d3e5906d4205d8f7b6aa40263cc18bc5b2b978271c7364ae
-MISC metadata.xml 947 BLAKE2B c6ad5462922681891425c0d7e296958083ca39c18bad64eb92aa3e4887d735c7b00d696ff07545ab7af8089c95bfe284549d6cac3cef04d332024b57f6e7512b SHA512 9504486c33e3e6890adb3607ba506c1381d7ffd4c59d6472eec6c463511a68690f5b070349b0aae63b1a4d9c953b1ea30af8b610e36b994db65d3dfe7fbd936f
+MISC metadata.xml 941 BLAKE2B cbab8ea24959d93c4ce88b85abe7957c0eba6d99fb0510bdc272a1a69cac37f47530db1f553bc68fd4ff6927fe7b8e8081b5759052937a95e0f51ff5b98609cb SHA512 d4dbb433f49bb08cb4a6dde9dc3bcc94228769db10f52b8058aef9c86f00b879cef3361b1b17423bb2f2a4e4798d6f1cbbf50da9fdc26992566b1cba69435993
diff --git a/media-sound/rgain/metadata.xml b/media-sound/rgain/metadata.xml
index 8c838e4b2c3f..4096733e8436 100644
--- a/media-sound/rgain/metadata.xml
+++ b/media-sound/rgain/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
-A set of Python modules and utility programmes to deal with Replay Gain information -- calculate it (with GStreamer), read and write it (with Mutagen). It has support for Ogg Vorbis (or probably anything stored in an Ogg container), Flac, WavPack (oddly enough) and MP3 (in different incarnations). There‘s also a command-line programme, replaygain, that works very similar to its like- named cousins, most prominently vorbisgain and mp3gain -- only that it works for all those supported formats alike. collectiongain on the other hand is a kind of fire-and-forget tool for big amounts of music files.
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		A set of Python modules and utility programmes to deal with Replay Gain information -- calculate it (with GStreamer), read and write it (with Mutagen). It has support for Ogg Vorbis (or probably anything stored in an Ogg container), Flac, WavPack (oddly enough) and MP3 (in different incarnations). There‘s also a command-line programme, replaygain, that works very similar to its like- named cousins, most prominently vorbisgain and mp3gain -- only that it works for all those supported formats alike. collectiongain on the other hand is a kind of fire-and-forget tool for big amounts of music files.
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">rgain</remote-id>
-    <remote-id type="bitbucket">fk/rgain</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">rgain</remote-id>
+		<remote-id type="bitbucket">fk/rgain</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index 94d0541f137c..58331a446793 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -5,4 +5,4 @@ DIST rplay_3.3.2-12.diff.gz 25322 SHA256 9f38ea87379e915ffb3fb338baf454f7ce2cbc6
 DIST rplay_3.3.2-16.debian.tar.xz 25456 SHA256 3c0e1dd8b107d1194ff7b73578281622a1bce97a3a21681d4e124e5c00977d62 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b WHIRLPOOL b8e566dd3a407fe2685b084537122b20944b9c0eaf33ea8f15ccd941fc2beaeffdf83ea54394e274d9e4f332b449230d9e0a5d3ca3b7e060accae70b45ca4677
 EBUILD rplay-3.3.2-r1.ebuild 964 BLAKE2B e5af079b7f03eed4aabb4ff0b8afb22fcaa43d259e2de71dcdf2d173c94e67c7ca4fc07d3a7b8cebe357066c96dea5608571a012ae33f019c5172c4fb6b096de SHA512 e6d60ccaa796159ef682b84970e171f88f03100b6f2c1e09ced966c274330fe37d809fda4c055f91c5c2e9bb3b8874c96ee7515f62b8cc4b573146c419abd3e2
 EBUILD rplay-3.3.2-r2.ebuild 1125 BLAKE2B 24522fbbbcbb42cda98f1692853708beef98a42fc50f998aeae58bd8234bdff1f75fa34fef2412e71044bbbbb3d4b8275416c110694a5bb1c3ec6b2427d2cc40 SHA512 8b949b1f97bf29b94cc9eac103a1cb365bee26da8f3dd91f2c6ac187cf0254366e36bf062d95fe0cef79dee0f3797faee54342430ecd3719c6e3c22fceb73785
-MISC metadata.xml 603 BLAKE2B 4ba393d6fea0e3a8994471d0b5c9ab74db398061c9e6430c3a5750d420c9b0a8de9a677f487962bd03a1baf48a5ee4f0a5fefc8d47db371f0661e817ee8ca195 SHA512 2c14a0b95c45b0c088dd0f2c58e30b15c7d5eba6b40cc56dfa5b999d3f419ef3eeaf95459e2a6da975f516ee9a0ba7aab62bece704bf2292c1f4312092c8889a
+MISC metadata.xml 602 BLAKE2B 12db89459ab4cc0696d1c6ede006c6f0365854801e2a67ae060fe0a807fc8021d5d4c0b992ee1adc21951bba7aaf5734aa7c4742feff563d8b009322f58cc5d7 SHA512 2133c5096ee010c0470667238f9d600c4617b9659615b3302abd81eb7b4b84107cfe9efa2070d5536d91aa11a90be1865703cdd5f92d0ea1f8718336a65cb272
diff --git a/media-sound/rplay/metadata.xml b/media-sound/rplay/metadata.xml
index cade504eaab3..a8457ac72f28 100644
--- a/media-sound/rplay/metadata.xml
+++ b/media-sound/rplay/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<longdescription lang="en">
- 		rplay is a flexible network audio system that allows sounds to be played
+		rplay is a flexible network audio system that allows sounds to be played
 		to and from local and remote Unix systems. Sounds can be played with or
 		without sending audio data over the network using either UDP or TCP.
 		rplay audio servers can be configured to share sound files with each
diff --git a/media-sound/sndfile-tools/Manifest b/media-sound/sndfile-tools/Manifest
index 7762811ace05..2174e28544dc 100644
--- a/media-sound/sndfile-tools/Manifest
+++ b/media-sound/sndfile-tools/Manifest
@@ -3,4 +3,4 @@ DIST sndfile-tools-1.03.tar.gz 474494 SHA256 f75df926a397d4dfa88748d51a3d3a9de1b
 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-9999.ebuild 790 BLAKE2B f7f1c9d11f67d2a6dc1ac4ed1ef54792b1638d0a72f2554517993d473acffa3ef7720af77421f7d6728b33a68ae52c30e5663db2bc1e63f0f72ecbc3f05e4864 SHA512 45908c7c4a07342f045fddca47efabb5654d507af8d722df151cd8d5336be493ec64a3a51e153e470ef3e9304fd516fa795ed93f133db96729d8cba808949738
-MISC metadata.xml 589 BLAKE2B 52c79497544a2047f0c5bb1a9cc8afe0aecfacf2edee487377202326b32c207112f04d2e42094b0d43d9f75602e068b5a2876100e3cc5bd510173f39a826b3aa SHA512 ad1a2f99f3e07e0319f5af7905845cd40e08c10f3ac246e6b0162125b55902d4c612ada31164890918894cd42761cf5418dad0f5225cb825bc652615a34cd5ea
+MISC metadata.xml 572 BLAKE2B 473449aba53817e0599e9135148ddf893d438fba7bac2325c923a180c3ef10fb63de920af5e1201117d1130647455e7f57f6e131cffd0ac9d5b82e6750ff014c SHA512 9d91c621d44f3a3bb70ac84f026d746db918ce6ba0c4b6b9b7e2c85811e10f4c7936cbb15368ae1d38bed6a593115ec7a63f6966aae30cc88140c6edf3527ec2
diff --git a/media-sound/sndfile-tools/metadata.xml b/media-sound/sndfile-tools/metadata.xml
index 2b515eb87eeb..398910b981cb 100644
--- a/media-sound/sndfile-tools/metadata.xml
+++ b/media-sound/sndfile-tools/metadata.xml
@@ -10,9 +10,9 @@
 		other libraries to do useful things. The collection currently includes
 		the following programs:
 
-		    * sndfile-generate-chirp
-		    * sndfile-jackplay
-		    * sndfile-spectrogram
-		    * sndfile-mix-to-mono 
+		* sndfile-generate-chirp
+		* sndfile-jackplay
+		* sndfile-spectrogram
+		* sndfile-mix-to-mono
 	</longdescription>
 </pkgmetadata>
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 0684aa6e2e7a..5f4d51289765 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,6 +1,4 @@
 AUX tomahawk-liblastfm-cmake.patch 3722 BLAKE2B ec639c4e2d36ddb9a087d37265b453a8085a869d950d2b8261906ebdef5f13ba3794f0417e00be422a5f0f1ef6cbe9e15f371c924be6f55cd291bb0257dcae09 SHA512 3e65d70d274abeee63cf98f1ee390157a95d82884678251f77b3257e3f7f042a778c6f346b47b3c5c5a0cfff9ac12e4d05d6bf5de818f0c1f1d433f8cce00e53
-AUX tomahawk-qtkeychain-cmake.patch 1262 BLAKE2B 777b11512837e11a899f0b3ab95d1096fa1cf5d9521387e362d973d81f1cd738e77b5e6784afcd4c329bb2e8982e721063464b52dab458df53a8acbf1b20dd68 SHA512 925a67398e1d61fd4b4682307ad2a3e961becd2c3440305e4551fb4209dc6b875aef62e93fee663a1b2028e318424ee01825dcca0d040f9532d9a1d0618a338c
-DIST tomahawk-0.9.0_pre20161029.tar.xz 7945264 SHA256 de4005fd68dfb11380419829e009f19b901c4b14ccec6dd63400b21612886271 SHA512 fcfe810f167de936ed5457b3f30d7e17ef5708389800c6be85a1f867fc75a6973fcc04181719910c127dcc226619bd7ea31e0273b981f84c8122a2e1709fbcf9 WHIRLPOOL b914df1f2a26cc18af021ef6fce5511b2a103d7243340bcaec3d0c98fa90fc2fcda32cabc8022c2106d9bd9dffa777765e17433dc268f2c317537716c31928f6
-EBUILD tomahawk-0.9.0_pre20161029-r1.ebuild 1826 BLAKE2B 960d12c35841dc3b13bf37ece419083815d4db166c6d380ce209e2948fbe0ab333fd1af5fadeb23a3043a114a65672868797723d7ecbd174db5712cd49e96577 SHA512 c1c408a48caa137cc03b9af082d0d8813126ca513c9c8b7fee1cab6ede3af68448b7df981113c523b24df89c767d8eeac0fe336b51a48f2d4a07d80d21899f62
-EBUILD tomahawk-9999.ebuild 1717 BLAKE2B fb77788df65af10ee5aab4d903f910b091aa9df68b99081ac7d6423f1c6a0fd0611b37c29d454b88ea2718d296e836922064f0fb837c7c79ca4761a46c8b2e3e SHA512 bd1b68fbc523560f089e3e2a33b6cd60fb1de4ff15e2678a696cd21edc7b1dfc21b3a5ea81672f47d35d927a7463a82d205974e302f906a1a470b09671cdb9bd
+DIST tomahawk-0.9.0_pre20170808.tar.gz 9913232 BLAKE2B 5a7ebd9419fece090c0aec1f8f47bf35e1f0fbae5cd6a41803ac265e7310dadac61ba4f2e25b0d2fbbb0068cbb3f7098c1d330ac81e671be1028ed3b78d32560 SHA512 edaa4c1637ca460f838dfdd7ecc9d5dae0b66a8280deb8dc6140c673ecc76aa1055efbbac1e9b2937ec01d6dd657935b907cadceb2059f8e055305e872866c2b
+EBUILD tomahawk-0.9.0_pre20170808.ebuild 1735 BLAKE2B a8d8481d4138fc35ab5daa850b184fcbb7985d369c0d82eda9770c7b5249ff5fb9fc0e3b0aa2b4335d47c65a8cd7f80f9fdb5167c094d10722be7c71d2363f11 SHA512 be085094b287b0230212afc36a4aed87f8b4ec3ebac95af76dcccec6a6d0e759956ec3f0179fe8412c743f4c638ffe38937b09120817f7c2fa28451e7e40e7d3
 MISC metadata.xml 554 BLAKE2B 162f2f8391a4b5226910cae53834752b14eb003091e7cce4f345f93923a6a09ada4289008efb9e76886f1b7dbd7709f75e010abfb85af71745e06b11394fb9a3 SHA512 25fb52f0a1c11c21f841e68d1485c4e1bcb8194ef16b414f71caa7d378fcea31461f73b0bd064049435d09baf4c90ebb85113f248232c5a933b54f7c971ef017
diff --git a/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch b/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch
deleted file mode 100644
index e4b3bf0304c9..000000000000
--- a/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 00f602e10203b76fc28b4615868c567e6bd4ced4 Mon Sep 17 00:00:00 2001
-From: Dominik Schmidt <dev@dominik-schmidt.de>
-Date: Tue, 8 Aug 2017 14:34:49 +0200
-Subject: [PATCH] Fix #619: Correctly detect qt5keychain
-
----
- CMakeLists.txt | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ad5d918ecf..7004e1b700 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -376,12 +376,8 @@ macro_optional_find_package(LibLastFm 1.0.0)
- macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm webservices" "https://github.com/lastfm/liblastfm" TRUE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
- 
- if( NOT APPLE )
--if( TOMAHAWK_QT5 )
--    macro_optional_find_package(Qt5Keychain 0.1.0)
--else()
--    macro_optional_find_package(QtKeychain 0.1.0)
--endif()
--macro_log_feature(QTKEYCHAIN_FOUND "QtKeychain" "Provides support for secure credentials storage" "https://github.com/frankosterfeld/qtkeychain" TRUE "" "")
-+macro_optional_find_package(Qt5Keychain 0.1.0)
-+macro_log_feature(Qt5Keychain_FOUND "QtKeychain" "Provides support for secure credentials storage" "https://github.com/frankosterfeld/qtkeychain" TRUE "" "")
- endif()
- 
- if( UNIX AND NOT APPLE )
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
deleted file mode 100644
index 39c73c56872a..000000000000
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	# SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
-	SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-else
-	EGIT_REPO_URI="https://github.com/tomahawk-player/${PN}.git"
-fi
-
-DESCRIPTION="Multi-source social music player"
-HOMEPAGE="https://www.tomahawk-player.org/"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-IUSE="+hatchet telepathy xmpp"
-
-CDEPEND="
-	$(add_frameworks_dep attica)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5]
-	dev-cpp/lucene++
-	dev-cpp/sparsehash
-	dev-libs/boost:=
-	dev-libs/qtkeychain:=[qt5(+)]
-	>=dev-libs/quazip-0.7.2[qt5]
-	media-libs/liblastfm[qt5]
-	>=media-libs/taglib-1.8.0
-	media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
-	>=net-libs/gnutls-3.2:=
-	x11-libs/libX11
-	hatchet? ( dev-cpp/websocketpp )
-	telepathy? ( net-libs/telepathy-qt[qt5(+)] )
-	xmpp? ( net-libs/jreen[qt5] )
-"
-DEPEND="${CDEPEND}
-	$(add_qt_dep designer)
-	$(add_qt_dep linguist-tools)
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${CDEPEND}
-	app-crypt/qca:2[ssl]
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-liblastfm-cmake.patch"
-	"${FILESDIR}/${PN}-qtkeychain-cmake.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CRASHREPORTER=OFF
-		-DBUILD_TESTS=OFF
-		-DBUILD_TOOLS=OFF
-		-DBUILD_WITH_QT4=OFF
-		-DWITH_KDE4=OFF
-		-DBUILD_HATCHET=$(usex hatchet)
-		-DWITH_TelepathyQt=$(usex telepathy)
-		-DWITH_Jreen=$(usex xmpp)
-	)
-
-	if [[ ${KDE_BUILD_TYPE} != live ]]; then
-		mycmakeargs+=( -DBUILD_RELEASE=ON )
-	fi
-
-	kde5_src_configure
-}
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild
index e433366a995b..11fbc52732b3 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild
@@ -3,20 +3,16 @@
 
 EAPI=6
 
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	EGIT_REPO_URI="https://github.com/tomahawk-player/${PN}.git"
-fi
+COMMIT=00f602e10203b76fc28b4615868c567e6bd4ced4
+inherit kde5 vcs-snapshot
 
 DESCRIPTION="Multi-source social music player"
 HOMEPAGE="https://www.tomahawk-player.org/"
+SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="+hatchet telepathy xmpp"
 
 CDEPEND="
@@ -30,20 +26,20 @@ CDEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtx11extras)
 	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5]
+	app-crypt/qca:2[qt5(+)]
 	dev-cpp/lucene++
 	dev-cpp/sparsehash
 	dev-libs/boost:=
 	dev-libs/qtkeychain:=[qt5(+)]
-	>=dev-libs/quazip-0.7.2[qt5]
-	media-libs/liblastfm[qt5]
+	>=dev-libs/quazip-0.7.2[qt5(+)]
+	>=media-libs/liblastfm-1.0.9-r1[qt5(+)]
 	>=media-libs/taglib-1.8.0
 	media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
 	>=net-libs/gnutls-3.2:=
 	x11-libs/libX11
 	hatchet? ( dev-cpp/websocketpp )
-	telepathy? ( net-libs/telepathy-qt[qt5(+)] )
-	xmpp? ( net-libs/jreen[qt5] )
+	telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
+	xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
 "
 DEPEND="${CDEPEND}
 	$(add_qt_dep designer)
diff --git a/media-sound/traverso/Manifest b/media-sound/traverso/Manifest
index 9edd752bfa45..1ebeb2ea9678 100644
--- a/media-sound/traverso/Manifest
+++ b/media-sound/traverso/Manifest
@@ -2,4 +2,4 @@ AUX traverso-0.49.2-desktop.patch 397 BLAKE2B 451566dd3c1f1db012810ce7dc341edf13
 AUX traverso-0.49.3-gcc6.patch 358 BLAKE2B f58e9b5a9ab5fcb87266251a3de18a5d5f1575b6b9391b66e3387ef524e1da7edb8d98140366e4ca66d6e09da8d5d6bb3addebc6f88b80215379f84733a5095f SHA512 f877f503ae05e76d653a0021db31ee84ef9e7aac7592ba241b9dfb558e6cd248a758001b817203cf00c81e7012a968c75081b3cdd1948bd5ba2db8e0cbad1eb9
 DIST traverso-0.49.3.tar.gz 1391101 SHA256 9e94b9b082c6891d5eaa5a8addb80b88f18bb7864899028eddf91a114a4b7382 SHA512 3db1dbc99ef3b0a9597959a6a3ce93909ec32d5f00648659debe1e8c5cec58ac6ab2108d5c66a1fc4145c2fe110c7db801fda8914664127653457132eac94ef2 WHIRLPOOL 3a44a45d9415071f80b8a788f28fcb38f489449d09dd5a93878f23af95eba1c1e8831db5ca6970ea97df91685051764d9ff21eeafeb3822cf29e478adb7c5a9f
 EBUILD traverso-0.49.3.ebuild 1852 BLAKE2B f913728b1f97fb02e1bfbfed392288c75a4991f6468336303028843dfd256c9269509344bc24c4cd77935096d65fc400c3b6943923c622f7822300942102cc43 SHA512 45bf52ea2428cf035672c7752be55368a8b08113efccfa396dc80289bb663d124c944d349abbbf093f73bb19f2a0c8b8e8d098796a85ed84e1b1b35dd340779c
-MISC metadata.xml 560 BLAKE2B a1c98563910568981fbdd7f686ab74982c2ae2405ee4a437095f98d78aa77629e3ed4cd179bef4ee0ea5ff83b64388b5fd1b6d39534b64ca62d857ae13c72c5e SHA512 90118acc778dce7042e3ac52517f7ca246ea6a7228e3f847c55a75ddda82a4d4ea46456681d06c1e88b0a7369e3c2b601408264b118eb55f56854918c48e1184
+MISC metadata.xml 549 BLAKE2B 24ea010b051ff1f74a4ee02fb17fb8dadd6d5fd7dde139b922accb0bfcab6d6ab9c210eda2446b2c25b9ae9122c037131313451e1b6d7081b1634f81c5982c03 SHA512 24c1c480ae3f907aae2948e43b245cc5882585870829712f89d49302ab36b8439c44400f59f52a2874136b3742fc8ccf4fd446131ca242f9af025eac325da053
diff --git a/media-sound/traverso/metadata.xml b/media-sound/traverso/metadata.xml
index a7183fbcec8f..36674346cb85 100644
--- a/media-sound/traverso/metadata.xml
+++ b/media-sound/traverso/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<longdescription lang="en">
 		Traverso is a multitrack audio recording and editing program for GNU/Linux with
 		special emphasis to create an easy to use program with a clean and
 		intuitive interface.
 	</longdescription>
-  <use>
-    <flag name="lv2">Add support for Ladspa V2</flag>
-  </use>
+	<use>
+		<flag name="lv2">Add support for Ladspa V2</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index f1c24546cdd9..d1c9af3c8a9a 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -24,4 +24,4 @@ DIST xmms2-0.8DrO_o.tar.bz2 1670726 SHA256 c77e41e7bd5788889d5a2f78331ca8c748b87
 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.ebuild 7396 BLAKE2B 7b1eaa463c899ce5d0a2c6cb18e8529b77075cdc205bcc06234f39d74f5ebaf47f06a47f1a35d96031592ae62fb329e8e15aa3861ca522ca1e03e48c74b2fb7f SHA512 7a9c795d826171d5ce9cd24ebe2b385967803a7ca2ee8b7d082c71a5255ded6485f3e6e96c0d4b648d8efdd03f191202296e7990b068dba2b1bb25a0b7bb51c9
-MISC metadata.xml 2711 BLAKE2B 72bed62865749ef7d2e49c975cc0a33f1c749c971e6125829f9d02f3e00f02ce8f83f0ace707cc879d051745b1551ec3db49e6da3e624ee0b9c079fafc9cc1e6 SHA512 001f334780da23cfc8d3c2ae2ce01e9268b4171d01cdae868f0d67296444ee64d27f0819cf431279269413f22227265dc1ea4dbf87b6ff86b7f00426f70cb044
+MISC metadata.xml 2667 BLAKE2B 7c5324e6c9ba6f3df5f6a3fb6d7cedb7abf62d1a29684f82843bae821da161230ee4c0292e23e6004f99260485911d5d0365c58e95dd3d5d85357df83fa3876a SHA512 1f096499b2a77e2c07d64d4ad562d316c7687d6d2335b720bcc60bc710d61b3278db331f68c05c3ad400176ca27cf4c7ea0c89886ea0d0ad4a30ee032ab4c996
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
index 26ce4e0e0a61..4072327e4cf2 100644
--- a/media-sound/xmms2/metadata.xml
+++ b/media-sound/xmms2/metadata.xml
@@ -13,22 +13,23 @@
 		your music.
 
 		List of features currently offered by XMMS2:
-		  Client-server model:
-		    * Allows XMMS2 to have various multiple interfaces (as clients).
-			o Command line interfaces
-			o GTK clients (matching GNOME &amp; XFCE4 look and feel)
-			o KDE clients (matching KDE look and feel)
-		    * Network transparency means you can run and control XMMS2 remotely, (e.g. run
-		      XMMS2 on your 'media box' and control it over network using a bluetooth-enabled
-		      PDA (TCP))
-		  Wide format support:
-		    * Can play FLAC, mp3, MOD, SID, speex, ogg vorbis, wave files.
-		    * Clean separation of transport and decoder subsystems
-		  Allows for more flexible access to media. (e.g. play mp3 files from a Samba
-		  share without having to mount it on the local filesystem)
+
+		Client-server model:
+		* Allows XMMS2 to have various multiple interfaces (as clients).
+		o Command line interfaces
+		o GTK clients (matching GNOME &amp; XFCE4 look and feel)
+		o KDE clients (matching KDE look and feel)
+		* Network transparency means you can run and control XMMS2 remotely, (e.g. run XMMS2 on your 'media box' and control it over network using a bluetooth-enabled PDA (TCP))
+
+		Wide format support:
+		* Can play FLAC, mp3, MOD, SID, speex, ogg vorbis, wave files.
+		* Clean separation of transport and decoder subsystems
+		Allows for more flexible access to media. (e.g. play mp3 files from a Samba
+		share without having to mount it on the local filesystem)
+
 		Medialib:
-		  Database-driven media library stores metadata about songs as they're played,
-		  so songs can be quickly recalled and new playlists easily made.
+		Database-driven media library stores metadata about songs as they're played,
+		so songs can be quickly recalled and new playlists easily made.
 	</longdescription>
 	<use>
 		<flag name="airplay">Support for airplay format</flag>
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 03:04:39 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 03:04:39 +0000
commit	407525b571b48cfd65e1ad7a02d250a927c967c9 (patch)
tree	844bea44d85dc7218f54970af1c42cc9d55c3f1a /media-sound
parent	89c6c06b8c42107dd231687a1012354e7d3039fc (diff)