gentoo resync : 07.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-07 11:03:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-07 11:03:14 +0100
commit: 957235cf19a691360c720f7913672adda4258ed0 (patch)
tree: 812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /media-sound
parent: 62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff)
63 files changed, 682 insertions, 1225 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bb48404528a1..bdd2ab5bf2ea 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index b22c3e6639b5..e9b470b22ae1 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -3,5 +3,5 @@ AUX sdk.patch 4357 BLAKE2B ad43209ebf78f1f8937bfde54c88034a9c0f426caf62da5aa70b6
 DIST apulse-0.1.10.tar.gz 110272 BLAKE2B 3e05c93de225125ed0de75f5576282da89acd88398d3a5159d09a6f50a7747a3a341e192f35520d3fa79a6739bf287bbcf39fb350116aa5b5a86ca5034a13034 SHA512 e922448095b7e3c8ae5766fadd5912ad39c1d0d68c73954305d17909b6bafe3a95c7e1ad4d63a4824293e0ba1495c253204343f31330c0ddb4fb419fe1f9eb12
 DIST apulse-0.1.12.tar.gz 117220 BLAKE2B 04d88a298ff5e21e19fda1979ebbc96a6441f83212d6903a004a54ee360276985e66b637571a76e3fe6821d42762ac515b02a8a2cb0149a66f3150e34bd0d9b7 SHA512 9fe39ab93e90d7ec589c7632bf439bfc7fe8bbd0792ce1197ec8547fbe1901fec50facdf33c55cfbadbc1af4414fdf48f1f241406903a8f15f445b97dca7076a
 EBUILD apulse-0.1.10.ebuild 1081 BLAKE2B 372e93e508f668fff85c7d9117ee305bfa47d4685122503e3c6789b4b7423fcdd403c3305f0a719105060703a8640980ede90ba9c4939bc7691352d1810ec85f SHA512 3ba6f8eddad6065760b3d31ad52d306e63992be35595903f57edb4c93bf7b5712ad0d61b21cbb7dc7009b8a80c626b33302d3462661f28ed2944b13a5b573ece
-EBUILD apulse-0.1.12-r4.ebuild 1596 BLAKE2B c120689c687e645fe1d3bc93924521b21dcee1c4b63e131c89fea710338838b68573b4d8d3cbc5537988d1a057a65c1f1a0d91711c601d817b30c2953569160c SHA512 770654a65ea7dca987b6e367018e256f1cb52bab940a9935b4aa45933c926062cc211277e918ff697c3efa9b786ba1a0895e59fd7381c924a2c29e774875031e
+EBUILD apulse-0.1.12-r4.ebuild 1427 BLAKE2B ec17b7b6e2851c83bc37c5717116b2bdfc29793ef8cd99c8f2e0666424282170e19e7f56d599266ca6dcbb95ce4c54ed15a0b6f353bac753e318f60764fa8be3 SHA512 5394018fc9c5bea858512980a959067b934e662ac8393cd88b60ed77762d77d0eeeba0dd65ded3d4a528713b2cab95b8d2fb5da1199337536a05c1c22630e680
 MISC metadata.xml 539 BLAKE2B 958678641d39164ac7da9bb779329185aafe5d551dfbabaaa0872b47cbfeba6fa5d545e715ebb1fb4eb730bc192696a1517c4f474a0a51f81136b213ec4fe9ea SHA512 49cce06f24b1c9a5ec42f549fc018517650339347f97e02864ea0e2a4216c092d38c75c46a588bad3896843962b477c2ad94b34cb1f39f8255116fc4b2c92fde
diff --git a/media-sound/apulse/apulse-0.1.12-r4.ebuild b/media-sound/apulse/apulse-0.1.12-r4.ebuild
index 46b1d98a51ad..b4e49def9d58 100644
--- a/media-sound/apulse/apulse-0.1.12-r4.ebuild
+++ b/media-sound/apulse/apulse-0.1.12-r4.ebuild
@@ -49,10 +49,7 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
-	cmake-utils_src_install
-	# The easiest way would be setting MULTILIB_CHOST_TOOLS at global scope, depending
-	# on USE=sdk, but this is no longer permitted, so workaround is required.
-	# See bug 666884 for details.
+	# Do not use deprecated MULTILIB_CHOST_TOOLS
 	if ! use sdk; then
 		unset BUILD_DIR
 		_install_wrapper() { newbin "${BUILD_DIR}/apulse" "${CHOST}-apulse"; }
diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest
index 002559d3206e..d618971f1936 100644
--- a/media-sound/bristol/Manifest
+++ b/media-sound/bristol/Manifest
@@ -1,8 +1,7 @@
 AUX bristol-0.60.11-cflags.patch 7046 BLAKE2B 1b51164828f40f722afeafd955efae25f11cd913bb223f670ea65368a56e8aad1c12480b3d5ec4b0787bebd5425ebc291d71bdc6f74ef1efdcc726d5d388606b SHA512 92881949eeeabd3afa6253f4830bcc3925bd8889ac8335c08b86a3d9c7e53ca097527a51a341d5f7bcb2fd81eda5e038a33eff92af381d8d6b6e0f03e5bcbe1e
+AUX bristol-0.60.11-dontcompress.patch 576 BLAKE2B 78f5629897a3ae3380f5e64ccce6fc485acddf12051a5be33ccde597ba20b8064dc8d597d6e93424c56eacd2ce8cb32bcce7c42bb9530b308136747cf21bbc5b SHA512 dd2fa1859af1e071784138af701caf65d9a076e287d767d64d70cba56462e6ce5c62aea2c50dd617598059372ef1cbe5d9571e3d18110bd64e7789fdb5d9edad
 AUX bristol-0.60.11-implicit-dec.patch 320 BLAKE2B 8fef42ab74f5f6777c86774a7f7c8092b20d8c596ab2118fd862bc32e0f3fa55ceee488cc88d4599f22b4b373d67c2af3ea189f3508e30564ffc71acb5e812a1 SHA512 50a59747c75a8843b06fc412c65d724d8f205be1c6d9d5c0aa0d38c57f0f1401634dd301b531f8a28ca43f3804727d9ded82e6fa49abd5372fc8e70f87f5b341
-AUX bristol-0.60.9-cflags.patch 553 BLAKE2B be5f096b1627d15d90b2c915e45e4f9112d41ff29bcc7121141c91928724af4fec0bc78a85ca79f5f398c4c304fb41f61cb41fcbfd84bae80a31bc2a1f6a89c2 SHA512 a687832402925cf596fdc563496607dd366bb6bd0f0ca6873ab28053eb6f03a164308cbcb2a9da3acce199610b225b3581e2dc3dab723693a57a1498aa32c4f3
+AUX bristol-0.60.11-rm_alsa-iatomic.h.patch 967 BLAKE2B 9da2f53f06e4db83c5fe280e3253c70a83e052304c9e5adcd6e64956c81ea7bfd9eaf1dd5d639aca581c16bb446140fcef591753b3325aa0f700ed3a8649f1db SHA512 a86aefdcb1a6431bce94dc062b4f3e73332196fc71a154c8d171991cd61b3694958229c5d329245e098976732f03f75516dd7521d887b822bd6441e66a1bd64a
 DIST bristol-0.60.11.tar.gz 4218697 BLAKE2B f981b3d54e763092539ff631cbb48c06846a1fdde79db385a904d1af280ffd1520c88cbcfdc7f3d504cc65bde35c55f804545eed5ccac14b1ab17b1dce3e184e SHA512 2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180
-DIST bristol-0.60.9.tar.gz 4323706 BLAKE2B 39c9a834ba9411f7a434dbc8db8630dd0200c25e645a315b57f1ed8626c816b42da6b5473ff882a01f766ed10240cf7bce98d3091be5c2a8e16c4af0cd6afd5f SHA512 216af07af507ecefa4f2ddcd61fda1c1b7456df1d50cd31112fcf2aa6a3aa153557f72d7ec35f5df70b9ce33935f01d27c8ad2cd42fef9622f3645179ae685ff
-EBUILD bristol-0.60.11.ebuild 1080 BLAKE2B f12711b0229ea0a2521e38751900c22837609d96de5a1ae5995b4f99d5b7a6cb62964de14f7a47878e87272b6bfb217f01c434ee327decfdd65f544311b878f2 SHA512 9e5066243a226662bc0909e8336365d46422f94104783db4455edaf3a1708a97606429f6c5e215a989ca94605e1c710ed2f57a1a3a322f38c0c0052d7a39ea13
-EBUILD bristol-0.60.9.ebuild 1025 BLAKE2B 26bc547f9f90b14e036d6eca5518145cab2a67dacba5ab41c1e7efbe74e2d3f01f87ea80b6df0e0c1300e371a966841614b7dd5e0910353e18c849965457134e SHA512 21c3632efc9d820b1f6fd5277117c59d03d941767e67710845eb7913dd49ed2a4d295b282b7ecadf735a559988b5fe87835604cb087bbf08d10c434e86b2f8e4
+EBUILD bristol-0.60.11-r1.ebuild 1196 BLAKE2B e32f880e80f8b418bc7a96b319a8ce108f7b6d1ad904c61b3732b16cc3fc497f8fd746e865679240bdde50fb084d2a8f858b09ace5af1f2d415f65f801927aff SHA512 3ec5ec5cda247f80c95189fa89f8783b4af16892df646e5784b814cc025808f366a57424c6571128ee7729494207ab2ad8b6745dd10840790ed295f89ca43430
 MISC metadata.xml 599 BLAKE2B fa41cf25b04bb687587a736332f3b66a63a52d13c0371b64aaf8c7d12515df8ac9b15c3e70687b6cd8157b493a65992f2e8a1a96db12cd372215b9791b46fc7d SHA512 ca1be472e9a1dce6e55d3313e9b11f0839fbb321c5b662ebf4a9aca0915d10b15cbe3aee3629b285886e84b53f8c7d0c65613e58be32d5d98f04360b368da1ba
diff --git a/media-sound/bristol/bristol-0.60.11.ebuild b/media-sound/bristol/bristol-0.60.11-r1.ebuild
index a5df5a182405..0cb211ac2850 100644
--- a/media-sound/bristol/bristol-0.60.11.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
 HOMEPAGE="https://sourceforge.net/projects/bristol"
@@ -17,31 +17,41 @@ IUSE="alsa oss static-libs"
 # jack: fails to build if disabled
 # pulseaudio: not fully supported
 
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
+RDEPEND="
+	>=media-sound/jack-audio-connection-kit-0.109.2
+	x11-libs/libX11
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	x11-libs/libX11"
+"
 # osc? ( >=media-libs/liblo-0.22 )
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	x11-base/xorg-proto"
+	x11-base/xorg-proto
+"
 
 DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-implicit-dec.patch
+	"${FILESDIR}"/${P}-dontcompress.patch
+	"${FILESDIR}"/${P}-rm_alsa-iatomic.h.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	epatch "${FILESDIR}"/${P}-implicit-dec.patch
+	default
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
 		--disable-version-check \
+		$(use_enable alsa) \
 		$(use_enable oss) \
-		$(use_enable alsa)
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-sound/bristol/bristol-0.60.9.ebuild b/media-sound/bristol/bristol-0.60.9.ebuild
deleted file mode 100644
index 1b2744c0bfc8..000000000000
--- a/media-sound/bristol/bristol-0.60.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils autotools-utils
-
-DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
-HOMEPAGE="https://sourceforge.net/projects/bristol"
-SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa oss static-libs"
-# osc : configure option but no code it seems...
-# jack: fails to build if disabled
-
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	x11-libs/libX11"
-# osc? ( >=media-libs/liblo-0.22 )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
-
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
-
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-version-check
-		$(use_enable alsa)
-		$(use_enable oss)
-		#$(use_enable osc liblo)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
new file mode 100644
index 000000000000..0b7cedc9e29d
--- /dev/null
+++ b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.am	2012-01-12 18:23:23.000000000 +0100
++++ b/Makefile.am	2018-10-04 01:22:03.656483227 +0200
+@@ -9,9 +9,6 @@
+ 	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL) -m 0644 $(srcdir)/bristol.1 $(DESTDIR)$(mandir)/man1/
+ 	$(INSTALL) -m 0644 $(srcdir)/bristoljackstats.1 $(DESTDIR)$(mandir)/man1/
+-	gzip -9fn $(DESTDIR)$(mandir)/man1/bristol.1
+-	gzip -9fn $(DESTDIR)$(mandir)/man1/bristoljackstats.1
+-	cd $(DESTDIR)$(mandir)/man1 && ln -sf bristol.1.gz brighton.1.gz && ln -sf bristol.1.gz startBristol.1.gz
+ 
+ installdb:
+ 	mkdir -p -m 0755 $(DESTDIR)$(bristoldir)
diff --git a/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
new file mode 100644
index 000000000000..9d11b4f7d99b
--- /dev/null
+++ b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
@@ -0,0 +1,26 @@
+Description: Stop using alsa/iatomic.h
+             Technically this is an API breakage in libasound 1.1.2,
+             but it makes sense to me that this header was removed
+             by ALSA upstream.
+             .
+             bristol was the only user in Debian, and even here the
+             code that once used it was already commented out.
+Author: Adrian Bunk <bunk@stusta.de>
+Reviewed-by: James Cowgill <jcowgill@debian.org>
+	     Herbert Parentes Fortes Neto <hpfn@debian.org>
+Bug-Debian: https://bugs.debian.org/834180
+Forwarded: no
+Index: bristol-0.60.11/libbristolaudio/audioEngineJack.c
+===================================================================
+--- a/libbristolaudio/audioEngineJack.c
++++ b/libbristolaudio/audioEngineJack.c
+@@ -38,9 +38,6 @@
+ #include <string.h>
+ 
+ #ifdef _BRISTOL_JACK
+-#if (BRISTOL_HAS_ALSA == 1)
+-#include <alsa/iatomic.h>
+-#endif
+ 
+ /*
+  * Drop this atomic stuff, it comes from the ALSA library and it not present on
diff --git a/media-sound/bristol/files/bristol-0.60.9-cflags.patch b/media-sound/bristol/files/bristol-0.60.9-cflags.patch
deleted file mode 100644
index 502b8eb937fe..000000000000
--- a/media-sound/bristol/files/bristol-0.60.9-cflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- bristol-0.60.9/libbrighton/Makefile.am.orig
-+++ bristol-0.60.9/libbrighton/Makefile.am
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS = foreign
- 
--AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. -O0 @BRIGHTON_HAS_X11@ @BRIGHTON_HAS_AUTOZOOM@
-+AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. @BRIGHTON_HAS_X11@ @BRIGHTON_HAS_AUTOZOOM@
- libbrighton_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ @BRIGHTON_LIBXLIBS@ @BRIGHTON_LIBXLIBS@
- 
- lib_LTLIBRARIES = libbrighton.la
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 548bc88a0a49..7c119ea7d34e 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -3,5 +3,5 @@ AUX cantata-2.3.2-opusfile.patch 1529 BLAKE2B fdfd27280f757ba4fa017fde4d52514dbb
 DIST cantata-2.2.0.tar.bz2 2251649 BLAKE2B 9b28a4e3a77245fcf00f81780adecdc51e066f068798f92300ef8527872313f5fb56d4b90a6f5511caf951ba9fcd5c094dd5e9062fe3d314b75412b3e8e03d37 SHA512 519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd
 DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589 SHA512 d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4
 EBUILD cantata-2.2.0.ebuild 2906 BLAKE2B afc79b29d42719e018485c8742a21bfe596925b2ff83fd8de69bd699bdff03b7dcf8c4a1b0ac69df26fb140b64457485b62ca542c0632b2ec436a064a29b7532 SHA512 62a3a89fe9661db39cc7a8682fd4df72f8fa911a25a4cb1db66cc8f0cd0acdd00912b60a43442832b2dc01df69ab4015e817b345dbe0dc3b71418f52334ee03a
-EBUILD cantata-2.3.2.ebuild 3178 BLAKE2B 47e139fb262e84e8cd63acdd7634a634bd533c65fd63b15343023ea5ba6b288fc11eaa9e5a99e6eed31a8740532be409b2ff9efafdde9233d17b133b38f3d97c SHA512 e80b43f055b28b5d0c5e8e411b6709c5add03dd35311441ec3d76bd868ae2c5bc9375959c61618b55a4d51d792ec364aaab4c79ff285b6a11a9d146809e73f4e
+EBUILD cantata-2.3.2.ebuild 3231 BLAKE2B eb0e61fe493625c48e813a5bfef9f783ee18228f4d0834e773d090f9e222039827cfad373cec47ac73cf6c588446d5f6097c3388c4e2fd7168519a52d8a10880 SHA512 5a5a92ca899306963e8740a6000b5333ac71bfb10086a1b6e35c7ce598275fc9a21b16b4881b80353a786e13f70b388785119f18bc05c9c2b35cf42b2144a5d0
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.3.2.ebuild b/media-sound/cantata/cantata-2.3.2.ebuild
index db85ccf2fbc9..e65a73704d8d 100644
--- a/media-sound/cantata/cantata-2.3.2.ebuild
+++ b/media-sound/cantata/cantata-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,8 +12,8 @@ SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf"
+KEYWORDS="amd64 x86"
+IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf"
 REQUIRED_USE="
 	?? ( cdda cdio )
 	cdda? ( udisks || ( cddb musicbrainz ) )
@@ -44,7 +44,8 @@ COMMON_DEPEND="
 	replaygain? (
 		media-libs/libebur128
 		media-sound/mpg123
-		virtual/ffmpeg
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
 	)
 	streaming? ( dev-qt/qtmultimedia:5 )
 	taglib? (
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index f6fd89465e09..9ee797e50195 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -3,5 +3,5 @@ DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68
 DIST clementine-1.3.1_p20180523.tar.gz 8490122 BLAKE2B 783cd420c8e3cd7423ecb6caa3466efd2c09e9033c2a198f52dc113603233f1bf3e3dc5208491338c0fdc9ab26e5b661e7fced0dd835b4c19a867fa3cacc9ccd SHA512 a47de226108240313fef2ce965726b3afea988030adffe38fdabf5d0dc46b2eda42cfebc32d77e939eb6dd687a99556c9bd8848c6a5e78c434950d00a8833200
 EBUILD clementine-1.3.1_p20180416.ebuild 5173 BLAKE2B 911367e87faa64ca4664a2765ee05d8df3809f86f0dffc560681fc5702b5e562e8ac6db8b8efc85cd9fcf3c574b0be05974353bdf45a9f8636a0d0c3508a6a58 SHA512 ac365714bc8e1477d2d7484816ac834334d9bb861a6fec763ef86ea79f88ab154c70d4bc027264f434bd97e46497d54ee9c68d84e0fd05894e3f33b0f16d0b2e
 EBUILD clementine-1.3.1_p20180523.ebuild 5175 BLAKE2B abd9e0acf98581c7bd9cb1cd4256c1e89401e0f6ae18d63582b0171663865abb26e5680520ed335a455dadae919460eb4bda420f26ae80013b97a951b19e4ede SHA512 6276db36f7e99efb51fe01ff708a46039d33364f6817883d1c9e7b4f47924fbcc8919dd817407be5ef27f1985213e528b940373ec8505d36ebcc628646e5162c
-EBUILD clementine-9999.ebuild 5108 BLAKE2B e5c0ed007db9b57a2934458a540f655bd546504308588b5e387586da1ade150d0562b456de63054c4434725265f0c97d1a17793ed50f6f2e8a689ebafdbe7838 SHA512 7952dd7ea1b9e3b7ddd657d5891791ed66fdbd0c844a317190055a6e08ffbaef1953b58a3cb3980b436a81fd30bb75f71da538ba1b371694b5e00e3f03e473b6
+EBUILD clementine-9999.ebuild 5054 BLAKE2B 3c0eb34b89cdc488a0e5553d43d9a80ab394e336fbee8e79bb322c3e86f0704c59ce30ff8eea96696d211d5f1218cd52aba929218f9f84c5dd8d940e2ba4767a SHA512 99250978824c2b96dc52f9298519be138ded54b60afb2ea17cc6c3133a49676d16f666947e001e31bb18894c78bdc9a4ec080f4eeb877fc7c7af55bffd5174be
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 53e377c09949..2d1b92dddf91 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -100,8 +100,6 @@ DEPEND="${COMMON_DEPEND}
 
 DOCS=( Changelog README.md )
 
-PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch )
-
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 7f556af68897..fc3c89a3f054 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,14 +1,6 @@
-AUX csound-6.05-python.patch 661 BLAKE2B 4f0daaf04cafd5daa967409f7e49ae553e8751c05ccb8f451723d2d303cafa7285860c1adb4308a99c58825194721829b8ce4e0c30f16b43969f73a0765497e2 SHA512 db931a76d0b386232d932c87ef30300497145dab3196cc059278947eeefc41723043392d652583f00512b306abbf33db3d7c9bc5203ead81689ed1ea8d0a541c
-AUX csound-6.09.1-python.patch 742 BLAKE2B b872878b91b5ad3200c78e0f5434f490e80f0879bb5cbaf9e2e4a53f9ea8ab29263fea84b81b13aea3dab1e79693901728e514519a3be7ce39c67c0e6bc17118 SHA512 52d2cb16831eb4090f22c7153f76213bbf4dfbf66ec791655714aa84db97dab6271022e64707247d24946ec5e019d20fe479a7a5d1711eac2c030625c4c86cdc
-DIST Csound6.09.1_manual_html.zip 15537547 BLAKE2B 8864cd42e811c596b1c17c68d0552edff39437412ce828772cf8cf13f47390d0edc25fa9a85ecfe1a50a01fe592cb0ee27ce5a11679195f8c1b41da9b1ede8cd SHA512 8ddd821737b003d277eadf5b966907314ee50380ab5cc7b9716588d1bcfac8950f591e076752650508c924d1068bac0334523a3d3b869a4f6d4118b822003afd
-DIST Csound6.09.1_manual_pdf.zip 8647957 BLAKE2B 52209784a08c67284a6481d17eaef8db2abf03f068bf347a40b06d4ba323389371474cb87fd93a318fe6abadeb69afd060be0aa64fdd2b638172ef33a282386a SHA512 1dd2c0058751fe1f176a51741380884db115bdb52416512882c43212fd5ded1c489cc9c423059c1154a1e01528e7bf6e70621eac6ee83a1a4b5e2388ab85ae1b
 DIST Csound6.10.0_manual_html.zip 15944722 BLAKE2B dfb2d00650e8d9ff650c60a5601b63446d0ce6d94eeac54812752039ef1b7c8c161a7694cb3381453f86759a810b81754e99cf5c8805cee61171c24a615114ab SHA512 f61f46705607eb39897fd3b27353fb233acd9da5e00a2b64d63116f74b889f2daafa72d48ed7c5ec1890e32d81331f91455861f2cb3fad3d13b7d27ec203357a
 DIST Csound6.10.0_manual_pdf.zip 8687461 BLAKE2B ff738378e10ce7e3fd9ab44bed67fdbf4a1de62d89d738a35fd46f25996d85dd8e97260af31bb2fbfe199aecd3f16f0adb5bf94d9a15807d6424002d7ab9682c SHA512 cf6ec335782032fb0703a3042c0222316cd215eba2be242e65d4f1ae23d886177620c96cc63c1aace43a72c1d6258a88612c1ffd5ef0e43675729bae39969fa1
-DIST csound-6.08.0.tar.gz 33948686 BLAKE2B 6a81e5806420b63ffd487d71d507d34336c46e91ec7073b4805324d04af31101c1ea65142f22aae2de071f149eb8fe4c88547b6795462aea248b585d029bad6c SHA512 22237f7c8ac875fd44789a729f5513dd7f751bbe0446b8a6e43c6a824b1c40978ef051122632af0c3975761fa7f873c01e88b9de7be313d9d23be09ed52c29ca
-DIST csound-6.09.1.tar.gz 41969942 BLAKE2B 87dd02f61346f95648391c405edc18d08edad9d33c1cd2ab2cf054e0f10b7f987aaedce698a18520a8d8559d1fd78a20fa4f3d7db99e6afb3fdba316207e0495 SHA512 c82d3e4fa5fba2c47f916ee102ba841477a819e1905e578089474ce5a7c4a4e70c4ec2768337621fcd2e3843af9b1129ce50f4a4fd3c33bfa27da52815b99454
 DIST csound-6.10.0.tar.gz 42036496 BLAKE2B 4305eb2aedb076f4a4079e1353f05f9ffe6159311fe905a11998f80eab9ccbbfe57c0601b94762480c486f8edbe0aa0f9b20d18f4db8f9f49d6466a7b2ef4697 SHA512 1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4
-EBUILD csound-6.08.0.ebuild 5569 BLAKE2B e134b89d7e62ba355621b3b57aa9b2b05df1477dc631ab33c05c5a1fcaa8def783138b6195f82a010e6f989904a2219499365a1fcb69f7579faeae2cd2932d3b SHA512 9bd0981e19af1f0c634d7d0f5a61f9738c65f8ab2cbdfd37d593327e6a8e2feb28be48dea052f6368bc007873ce5c61b17b45c7b381ca7139a8c7e0ef25f05d5
-EBUILD csound-6.09.1.ebuild 5972 BLAKE2B ec879625528671ccd4d82f14b71c2ce525260e8051986825f86ffd747e57dc0ed64af3fea6fe2eb3d316e54a89b235ceebd6577ab24b8834a9c59dc43b137cdb SHA512 e5be516ec79273158ee1b574753047b50ef980e0478a77a0fc73548083a7985b0befc074c9b71eb36fde943ef296b351e584b58adbd38a63276b2c71f2eaacd6
 EBUILD csound-6.10.0.ebuild 5927 BLAKE2B f2915b61df2e5aef642bacc0df54ee96e60b1b3c725852ee9a76e3d1640a55fdb9ebacd9e71f156ce14b083256624d0dd451437ddb016e3120461e277fd92cd9 SHA512 28207d944e58eac4ef03b9f14205928d68947b301620138b3125772d961f2b873c69697c5ab232870aa879be156d24392e79fa469ce08899557d2db9e597c30d
-EBUILD csound-9999.ebuild 5927 BLAKE2B f2915b61df2e5aef642bacc0df54ee96e60b1b3c725852ee9a76e3d1640a55fdb9ebacd9e71f156ce14b083256624d0dd451437ddb016e3120461e277fd92cd9 SHA512 28207d944e58eac4ef03b9f14205928d68947b301620138b3125772d961f2b873c69697c5ab232870aa879be156d24392e79fa469ce08899557d2db9e597c30d
+EBUILD csound-9999.ebuild 5615 BLAKE2B 6701c92c773973a49c0853d6b392c634c6d524c5b5ff661a753bafeb7eae27319d608cf155ec1bbda9c220fe6a65301e71cbd66f1127f4559e0a9ac1cefcd417 SHA512 ad8ee79bde82687414237e241530b940a5b19db5faffebbff69258719cbc671ee97291588924854a238b5a168cb85c38cd12f5743bd9741dc75b79c7074dfaf5
 MISC metadata.xml 1487 BLAKE2B e94fef343f96f5fe68a0fb486b7f8bd9f8af7fb3f585696a4b6d909cc1e87f2da66ab73b24ad1b3c809db472877febb8fbde2c3fc5b2abfab35c3efe9eddf321 SHA512 215f491284f409a299d5c4ef8d9df6f377a4a5e032bce40870fb72c7c6bbcdaa8ea0879a86c3379207e0b69df7f735254936e97ed68ebd2aeecf9498c646037e
diff --git a/media-sound/csound/csound-6.08.0.ebuild b/media-sound/csound/csound-6.08.0.ebuild
deleted file mode 100644
index 56eb7fc9cdf6..000000000000
--- a/media-sound/csound/csound-6.08.0.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils java-pkg-opt-2 toolchain-funcs versionator python-single-r1 cmake-utils
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/csound/csound.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A sound design and signal processing system for composition and performance"
-HOMEPAGE="https://csound.github.io/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
-fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
-portaudio portmidi pulseaudio python samples score static-libs stk tcl test
-+threads +utils vim-syntax websocket"
-
-LANGS=" de en_US es_CO fr it ro ru"
-
-REQUIRED_USE="
-	csoundac? ( || ( lua python ) )
-	java? ( cxx )
-	linear? ( double-precision )
-	lua? ( cxx )
-	python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-
-RDEPEND="
-	>=media-libs/libsndfile-1.0.16
-	media-libs/libsamplerate
-	alsa? ( media-libs/alsa-lib )
-	csoundac? (
-		x11-libs/fltk:1[threads?]
-		dev-cpp/eigen:3
-		dev-libs/boost:=
-	)
-	curl? ( net-misc/curl )
-	dssi? (
-		media-libs/dssi
-		media-libs/ladspa-sdk
-	)
-	fluidsynth? ( media-sound/fluidsynth )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	image? ( media-libs/libpng:0= )
-	jack? ( media-sound/jack-audio-connection-kit )
-	java? ( virtual/jdk:* )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( sci-mathematics/gmm )
-	lua? (
-		luajit? ( dev-lang/luajit:2 )
-		!luajit? ( dev-lang/lua:0 )
-	)
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	stk? ( media-libs/stk )
-	tcl? (
-		>=dev-lang/tcl-8.5:0=
-		>=dev-lang/tk-8.5:0=
-	)
-	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
-	csoundac? ( dev-lang/swig )
-	nls? ( sys-devel/gettext )
-	test? (
-		dev-util/cunit
-		${PYTHON_DEPS}
-	)
-"
-
-# requires specific alsa settings
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/csound-6.05-python.patch )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-		-e '/-O3/d' \
-		-i CMakeLists.txt || die
-
-	local lang
-	for lang in ${LANGS} ; do
-		if ! has ${lang} ${LINGUAS-${lang}} ; then
-			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
-		fi
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_ALSA=$(usex alsa)
-		-DBUILD_CSBEATS=$(usex beats)
-		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_CSOUND_AC=$(usex csoundac)
-		-DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex csoundac $(usex lua))
-		-DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex csoundac $(usex python))
-		-DBUILD_CXX_INTERFACE=$(usex cxx)
-		-DUSE_CURL=$(usex curl)
-		-DNEW_PARSER_DEBUG=$(usex debug)
-		-DUSE_DOUBLE=$(usex double-precision)
-		-DBUILD_DSSI_OPCODES=$(usex dssi)
-		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DUSE_FLTK=$(usex fltk)
-		-DBUILD_IMAGE_OPCODES=$(usex image)
-		-DUSE_JACK=$(usex jack)
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=$(usex java)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_OPCODES=$(usex lua)
-		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DUSE_GETTEXT=$(usex nls)
-		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DUSE_OPEN_MP=$(usex openmp)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PORTMIDI=$(usex portmidi)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_PYTHON_OPCODES=$(usex python)
-		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DSCORE_PARSER=$(usex score)
-		-DBUILD_STATIC_LIBRARY=$(usex static-libs)
-		-DBUILD_STK_OPCODES=$(usex stk)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_STATIC_LIBRARY=$(usex test)
-		-DBUILD_TCLCSOUND=$(usex tcl)
-		-DBUILD_MULTI_CORE=$(usex threads)
-		-DBUILD_UTILITIES=$(usex utils)
-		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-		-DNEED_PORTTIME=OFF
-		-DBUILD_RELEASE=ON
-	)
-
-	use python && mycmakeargs+=(
-		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
-	[[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
-		-DUSE_LIB64=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc -r Release_Notes/.
-
-	# Generate env.d file
-	cat > "${T}"/62${PN} <<-_EOF_ || die
-		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
-		CSSTRNGS="${EPREFIX}/usr/share/locale"
-	_EOF_
-	if use stk ; then
-		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
-	fi
-	doenvd "${T}"/62${PN}
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED%/}"/usr/bin/{,csound_}extract || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}
diff --git a/media-sound/csound/csound-6.09.1.ebuild b/media-sound/csound/csound-6.09.1.ebuild
deleted file mode 100644
index 7f018b3a9139..000000000000
--- a/media-sound/csound/csound-6.09.1.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/csound/csound.git"
-	inherit git-r3
-else
-	DOC_P="Csound${PV}"
-	SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz
-		doc? (
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-		)"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A sound design and signal processing system for composition and performance"
-HOMEPAGE="https://csound.github.io/"
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
-portaudio portmidi pulseaudio python samples score static-libs stk tcl test
-+threads +utils vim-syntax websocket"
-
-IUSE_LANGS=" de en_US es es_CO fr it ro ru"
-
-REQUIRED_USE="
-	csoundac? ( || ( lua python ) )
-	java? ( cxx )
-	linear? ( double-precision )
-	lua? ( cxx )
-	python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-
-RDEPEND="
-	>=media-libs/libsndfile-1.0.16
-	media-libs/libsamplerate
-	alsa? ( media-libs/alsa-lib )
-	csoundac? (
-		x11-libs/fltk:1[threads?]
-		dev-cpp/eigen:3
-		dev-libs/boost:=
-	)
-	curl? ( net-misc/curl )
-	dssi? (
-		media-libs/dssi
-		media-libs/ladspa-sdk
-	)
-	fluidsynth? ( media-sound/fluidsynth )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	image? ( media-libs/libpng:0= )
-	jack? ( media-sound/jack-audio-connection-kit )
-	java? ( virtual/jdk:* )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( sci-mathematics/gmm )
-	lua? (
-		luajit? ( dev-lang/luajit:2 )
-		!luajit? ( dev-lang/lua:0 )
-	)
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	stk? ( media-libs/stk )
-	tcl? (
-		>=dev-lang/tcl-8.5:0=
-		>=dev-lang/tk-8.5:0=
-	)
-	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
-	csoundac? ( dev-lang/swig )
-	nls? ( sys-devel/gettext )
-	test? (
-		dev-util/cunit
-		${PYTHON_DEPS}
-	)
-"
-
-if [[ ${PV} != "9999" ]]; then
-	DEPEND+="doc? ( app-arch/unzip )"
-fi
-
-# requires specific alsa settings
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-python.patch )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-		-e '/-O3/d' \
-		-i CMakeLists.txt || die
-
-	local lang
-	for lang in ${IUSE_LANGS} ; do
-		if ! has ${lang} ${LINGUAS-${lang}} ; then
-			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
-		fi
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_ALSA=$(usex alsa)
-		-DBUILD_CSBEATS=$(usex beats)
-		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_CSOUND_AC=$(usex csoundac)
-		-DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex csoundac $(usex lua))
-		-DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex csoundac $(usex python))
-		-DBUILD_CXX_INTERFACE=$(usex cxx)
-		-DUSE_CURL=$(usex curl)
-		-DNEW_PARSER_DEBUG=$(usex debug)
-		-DUSE_DOUBLE=$(usex double-precision)
-		-DBUILD_DSSI_OPCODES=$(usex dssi)
-		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DUSE_FLTK=$(usex fltk)
-		-DBUILD_IMAGE_OPCODES=$(usex image)
-		-DUSE_JACK=$(usex jack)
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=$(usex java)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_OPCODES=$(usex lua)
-		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DUSE_GETTEXT=$(usex nls)
-		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DUSE_OPEN_MP=$(usex openmp)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PORTMIDI=$(usex portmidi)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_PYTHON_OPCODES=$(usex python)
-		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DSCORE_PARSER=$(usex score)
-		-DBUILD_STATIC_LIBRARY=$(usex static-libs)
-		-DBUILD_STK_OPCODES=$(usex stk)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_STATIC_LIBRARY=$(usex test)
-		-DBUILD_TCLCSOUND=$(usex tcl)
-		-DBUILD_MULTI_CORE=$(usex threads)
-		-DBUILD_UTILITIES=$(usex utils)
-		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-		-DNEED_PORTTIME=OFF
-		-DBUILD_RELEASE=ON
-	)
-
-	use python && mycmakeargs+=(
-		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
-	[[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
-		-DUSE_LIB64=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc -r Release_Notes/.
-
-	# generate env.d file
-	cat > "${T}"/62${PN} <<-_EOF_ || die
-		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
-		CSSTRNGS="${EPREFIX}/usr/share/locale"
-	_EOF_
-	if use stk ; then
-		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
-	fi
-	doenvd "${T}"/62${PN}
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED%/}"/usr/bin/{,csound_}extract || die
-
-	use python && python_optimize
-
-	# install docs
-	if [[ ${PV} != "9999" ]] && use doc ; then
-		dodoc "${WORKDIR}"/*.pdf
-		dodoc -r "${WORKDIR}"/html
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index 5906af36652d..b97419c554c2 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
 
-inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils java-pkg-opt-2 python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/csound/csound.git"
@@ -19,15 +19,15 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="A sound design and signal processing system for composition and performance"
+DESCRIPTION="Sound design and signal processing system for composition and performance"
 HOMEPAGE="https://csound.github.io/"
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
 IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
-portaudio portmidi pulseaudio python samples score static-libs stk tcl test
-+threads +utils vim-syntax websocket"
+fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc portaudio
+portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
+vim-syntax websocket"
 
 IUSE_LANGS=" de en_US es es_CO fr it ro ru"
 
@@ -70,10 +70,6 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
 	stk? ( media-libs/stk )
-	tcl? (
-		>=dev-lang/tcl-8.5:0=
-		>=dev-lang/tk-8.5:0=
-	)
 	utils? ( !media-sound/snd )
 	websocket? ( net-libs/libwebsockets )
 "
@@ -96,13 +92,7 @@ fi
 # requires specific alsa settings
 RESTRICT="test"
 
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
 pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
 	if use python || use test ; then
 		python-single-r1_pkg_setup
 	fi
@@ -148,18 +138,15 @@ src_configure() {
 		-DBUILD_LUA_INTERFACE=$(usex lua)
 		-DUSE_GETTEXT=$(usex nls)
 		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DUSE_OPEN_MP=$(usex openmp)
 		-DUSE_PORTAUDIO=$(usex portaudio)
 		-DUSE_PORTMIDI=$(usex portmidi)
 		-DUSE_PULSEAUDIO=$(usex pulseaudio)
 		-DBUILD_PYTHON_OPCODES=$(usex python)
 		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DSCORE_PARSER=$(usex score)
 		-DBUILD_STATIC_LIBRARY=$(usex static-libs)
 		-DBUILD_STK_OPCODES=$(usex stk)
 		-DBUILD_TESTS=$(usex test)
 		-DBUILD_STATIC_LIBRARY=$(usex test)
-		-DBUILD_TCLCSOUND=$(usex tcl)
 		-DBUILD_MULTI_CORE=$(usex threads)
 		-DBUILD_UTILITIES=$(usex utils)
 		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
diff --git a/media-sound/csound/files/csound-6.05-python.patch b/media-sound/csound/files/csound-6.05-python.patch
deleted file mode 100644
index 3e9ee857fe98..000000000000
--- a/media-sound/csound/files/csound-6.05-python.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- csound-6.05.0.orig/CMakeLists.txt	2015-04-26 03:06:22.941646148 +0800
-+++ csound-6.05.0/CMakeLists.txt	2015-07-08 22:31:16.637995822 +0800
-@@ -41,15 +41,9 @@
-     set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
- endif()
-
--
--execute_process (
--     COMMAND python -c
--     "import site, sys; sys.stdout.write(site.getusersitepackages())"
--     OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
--   )
--
- set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
- set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
-+set(PYTHON_MODULE_INSTALL_DIR ${REPLACE_ME})
- set(LOCALE_INSTALL_DIR "share/locale")
- set(HEADER_INSTALL_DIR "include/csound")
-
diff --git a/media-sound/csound/files/csound-6.09.1-python.patch b/media-sound/csound/files/csound-6.09.1-python.patch
deleted file mode 100644
index 47461e48aaf4..000000000000
--- a/media-sound/csound/files/csound-6.09.1-python.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Respect externally set PYTHON_MODULE_INSTALL_DIR.
-
---- csound-6.09.1/CMakeLists.txt
-+++ csound-6.09.1/CMakeLists.txt
-@@ -218,11 +218,13 @@
-     set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
- endif()
- 
--execute_process (
--     COMMAND python -c
--     "import site, sys; sys.stdout.write(site.getusersitepackages())"
--     OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
--   )
-+if(NOT DEFINED PYTHON_MODULE_INSTALL_DIR)
-+    execute_process (
-+        COMMAND python -c
-+        "import site, sys; sys.stdout.write(site.getusersitepackages())"
-+        OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
-+    )
-+endif()
- 
- set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
- set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index 67810a29d4fa..f09a2a775675 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -1,6 +1,6 @@
 AUX darkice-1.2-gcc47.patch 236 BLAKE2B df44cbc3ce60ff0fee38e4ede7d0321adc2b1fc15dd3bfc322ff08d7eaf4d3405dfce796c0a5f7757f9658ff992d208b12bf0e1b7fa31d1763d75f4d2e24b079 SHA512 4f77a2694f2bb574c600edfe1d2b88dd1d9c932ff8280e8fe0739c50f5ec346c284d49ac34993e351582c1a4909b9dd380073df7a16b62b8db71c66b0f1c7326
 DIST darkice-1.2.tar.gz 357026 BLAKE2B 3553711a05631feca198de83387234dc1ca85429ee69424910352e32d3ec4f8037ff33fcb4946aef0f84f58deb59e073be007856fd9cbe01b1570d4a0244ba98 SHA512 d8959819d70eb9b44a34d087fcf3897be5e4cb23681c049f8d88e251d83dfd86b90fdd37744fe27d861dfcbb6bb6e1521b48c5c7b4967bb061ede75596f0a823
 DIST darkice-1.3.tar.gz 371411 BLAKE2B 45684ba4a14dc7cc6271400af11f4aa610fe3d079d1f497f277af866fef92f58080efb6fa6d230288444e78ea93e5cd1257d441d75cbbb7a9ce1696091ed0fe0 SHA512 710dde580005e999e9b11981affdefab6c01868710e9de29d93fb0f40db3321dfe3ab6ed2dc1887bb22ac9a0789fe1648d948f4453c92feb312f7af97c253674
-EBUILD darkice-1.2.ebuild 1431 BLAKE2B fbc42f6f6551873b2d3dd3b348e0c6b3dc9c99ba06d988b2604ea537de887b298691cca6d97098b82dbcbba323aa7befd39d7d36b8b097810c001aa8d5c54cc1 SHA512 69f6c945a9aab85805bf3a55636f4f2f292fc29ab22bc3f92bd9aa081beceafed55affa811178d5568d8be62d70fbd5749294cbe8d0ab77b2f36808a279282ee
+EBUILD darkice-1.2.ebuild 1432 BLAKE2B 4b891be0777bdcb207018dc8bae3e4627b8ef6c70b49c7563d27b9c0983ea625ac1f9feeab66bafb0382d51c425a473b8727c746363d58116caa9f8155731968 SHA512 0a5a6eeebbb1bd28dc117939a504981872ccf9ca010123d7b8dee40c3f3343776804bfcc736a231791b83f63c3b149b52de87190ddd2d9b3cddc424f08a7d754
 EBUILD darkice-1.3.ebuild 1309 BLAKE2B 3d29d9e552859c1e9c32cd003b966fea820588d9e92d4fe62ef54c5e73edcb519cb8ce30aafe9b8df30e6b75716e62af32b223c777331dd04f908133c141e833 SHA512 923c2bca3c9d7e166b46c945a771745a874feb3ad8244863fb3857882dd64005dee846164a0628f62f25db15201611c188864a320fc838c0a9fba496ad7f3e4e
 MISC metadata.xml 583 BLAKE2B 748e92c324b0685539a85ae1d2816ad9c7241fc8a6c3b30799a499f74612c4593fcc513b95b1236a188925e63eb2caca859671b7a43247d2737c5c90767a27de SHA512 673e3a01b1a5bd92119ad87e56b85dae309fa3f7a9de66d21908557819887ed3804477566ce0a00c2a919ae760ea7896cf67b2d25e894fa52463110fa0e23ba8
diff --git a/media-sound/darkice/darkice-1.2.ebuild b/media-sound/darkice/darkice-1.2.ebuild
index 3efe53015512..959c5f101b9c 100644
--- a/media-sound/darkice/darkice-1.2.ebuild
+++ b/media-sound/darkice/darkice-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="https://darkice.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
+KEYWORDS="amd64 ~hppa ppc sparc x86"
 IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
 
 RDEPEND="aac? ( media-libs/faac )
diff --git a/media-sound/id3ted/Manifest b/media-sound/id3ted/Manifest
index 772503f7c8d0..7f303083ce6f 100644
--- a/media-sound/id3ted/Manifest
+++ b/media-sound/id3ted/Manifest
@@ -1,6 +1,4 @@
 AUX id3ted-1.0-outofbounds.patch 713 BLAKE2B f0e61828e73939d3497402d7b37d751e42393ff72d64be20c3c4f7f48ce9b484e1ccaf9915c291b35b0e21efab3c5a2419cff4c101b79176b8603851bced1855 SHA512 942b1858bcd917c2a0c3be023f666bcc38b364edce976ab3f3f9f4d16f1822240aedb33965086f5f67832096fa408e24d6c85cfe91a2adc1cc84bee8d4ebef9a
 DIST id3ted-1.0.tar.gz 32792 BLAKE2B 3df3a5a48302ecac6dbccbf7ddacb3db193e67f8352159d3c31763d03e6bf48c46c2aaf056b0d08649e33c7d4440f72a0dc1869b3d0978cba470bc2b609ff804 SHA512 ba135779ac8bb7e83d77737babc836a2bbf4cd7efd4ffad5aa982ec9f6c57d0479f0bdf017e62d62dddffcadab88ab7b3f07408d173d013b794d20bccd5218ee
-DIST id3ted-1.0b3.tar.gz 33023 BLAKE2B 441a5d7a4d486d87b2479184aadb6e067f878877e5e8ef25d01139b2d59e1603d52a31646fcbab2f2c228652cb0d67434bca9ce584c6ba02d4841fa9310c3174 SHA512 6478ee5b6ba652687dd17828a039e8b6fc2b593285c01309c32dfcd7ec4e0e24c10288a195e9b95c47689c844f342498d5151904bd2e596de0e5ec73afa0bd7f
-EBUILD id3ted-1.0.ebuild 540 BLAKE2B 2613d7481c6632000b39b4a8eefd2be78680d814590f2e16d0d822b2921eb9046c0ba6ac0ee5797060532fb053c5cf16d2caa0c19a66e00e06e99fc1aa9b263d SHA512 bfdc69db5ceb39086d39d3faf25e53c3d0fb4910135b9c597422d24a8ae21402b1a0534f9895d3fba9ed21d23fd6229d343739544636a18f278bf9a502866357
-EBUILD id3ted-1.0_beta3.ebuild 508 BLAKE2B b9f2442474f14acabb299f079da2f9586a2e010ddbab6fa3d58a8d0271641a3439dfe51451ec4932acdce61732e949caed389c33f285a39905cfdd151513e645 SHA512 b1347d06e62eb32d3e72cdfad9b4f8bb682c1090be9d93d182c260b880d1baba71a431c5ea0440fa760534beda4f29000449d22e73014e95c9ef74bb03460fa2
+EBUILD id3ted-1.0.ebuild 535 BLAKE2B 9a7c05902d3c26a1c8c602279878c0af21f82d96af118180c4f23f195e18a29bdfe8ea541f43fc39fa7a264a060882429a18cad7a9c5dbcfc6ea4d769f721f51 SHA512 c91d9f69d9c58394049bce89385557b37bb5b3ba6222422efc77b7df47fa74576a892b01e368f16056a705227d9438c19e1a5826ba5d6f5caaab9bcfd530ed2b
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/id3ted/id3ted-1.0.ebuild b/media-sound/id3ted/id3ted-1.0.ebuild
index 8647777f37f4..d0517031cfc7 100644
--- a/media-sound/id3ted/id3ted-1.0.ebuild
+++ b/media-sound/id3ted/id3ted-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/id3ted/id3ted-1.0_beta3.ebuild b/media-sound/id3ted/id3ted-1.0_beta3.ebuild
deleted file mode 100644
index 58bbc2725999..000000000000
--- a/media-sound/id3ted/id3ted-1.0_beta3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-MY_P=${PN}-${PV/_beta/b}
-DESCRIPTION="A Command-line ID3 Tag Editor"
-HOMEPAGE="https://muennich.github.com/id3ted/"
-SRC_URI="mirror://github/muennich/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/taglib
-	sys-apps/file"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	export PREFIX="/usr"
-	tc-export CXX
-}
diff --git a/media-sound/lingot/Manifest b/media-sound/lingot/Manifest
index 907c29290a4c..2d977b2576f3 100644
--- a/media-sound/lingot/Manifest
+++ b/media-sound/lingot/Manifest
@@ -1,4 +1,4 @@
-AUX lingot-0.9.1-clean-install.patch 391 BLAKE2B 3b4465ca72b6a091559c3fd6e3cbc2d724292954c6c1994593971ca087cb44cc44972897881a13caf2faaa33227ced0df3406732bfc8eecf97d8d425e09cd842 SHA512 f8b1321e5a7ca97981779f92f33cbc2a8aa79b9d9e0b6352475ab0d150c89b3d93b6b4c92a0ae6644408ab3cbcd0879afe6a80dc9ea5b0b89a4fc492aa895da7
-DIST lingot-0.9.1.tar.gz 440043 BLAKE2B d2e6f3f150b03e934cceb4cc9909911bc55bedaf51254929f0fb4e092bed69606e7432e20b671769d2eac0ca4f05d282172ba2d388af2f8bed837d245d744af3 SHA512 6f4745823436fe24dce8c90c5780691aebf8106380d5d56858bc641448b875feeb97b98603b5839c429d35d8d7e1221cb62c2a0e19dbb41b160b5580dfc9a55f
-EBUILD lingot-0.9.1.ebuild 843 BLAKE2B 1b0add8ba671fbb2896d81249c5d65ddfb5059675e3ec38672927a98f6f1142b516dcf51ee15f07533a9558b2a9baf34ac3909906bf56a7ee0d1fa94da489788 SHA512 e749c8d6d891b0089fcd5a89ed476aa9d4e5fc732c748fa39159c15101756736bb04747336eb777f5e3ff00b76238877332f7b7d68d206668928c2edeb48c7b9
+AUX lingot-1.0.1-configure.patch 6864 BLAKE2B 8673086b4bc2d5f9eab73886685746dfe8488aba86fe8472aebc04ff2883ce641896914cae523f440605d072a2e43313291734be8988056deca0d0459908a159 SHA512 cf8df1ad198c4011153b6c337f35882f1c1ab3b4cff26a3cf6f348b23cce05bbe4cd739489f7bf9080d2557f9a30455ffb2aa70927fa46dc34ca584cb6e10e52
+DIST lingot-1.0.1.tar.gz 510112 BLAKE2B a04ef52cc70dba8af54746419190eedc2f2512120e3c1e8576dab0d6dd20c3470a6f857fd751ed4bcf8e291a993ff1f8fa7b0264a24957dcfab0efd9684ef3ba SHA512 98182721ef68411485b3f2faccbf315f340e549dd7cce0fdfaacab7c34fb708c98eda9b96da00701f1987becefced3a7587ffaaad77d6ef86046fb8c9f5f1cb5
+EBUILD lingot-1.0.1.ebuild 1059 BLAKE2B 5973aecd0c12e3c53a9e0262befc01c1a804a09ce4267e2b8e2260fb5c271ae8a8ec629667ae975bee93b7493e35b88b45761beda033c31f171d94dcae97e6fe SHA512 1c86b5c81724daa34a9a977d33daa6f6230f941452fcd9419aa0714eada328bf6624fe238dc0c3e9ab1c913ed27966aa1a6b0559049379262b8ff9fd737958fa
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/lingot/files/lingot-0.9.1-clean-install.patch b/media-sound/lingot/files/lingot-0.9.1-clean-install.patch
deleted file mode 100644
index 826a9fd29ce2..000000000000
--- a/media-sound/lingot/files/lingot-0.9.1-clean-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- lingot-0.9.1.orig/Makefile.am
-+++ lingot-0.9.1/Makefile.am
-@@ -8,19 +8,11 @@
- lingotdocdir = ${docdir}
- lingotdoc_DATA = \
- 	README\
--	COPYING\
- 	AUTHORS\
- 	ChangeLog\
--	INSTALL\
- 	NEWS\
--	TODO\
- 	THANKS\
--	MAINTAINERS\
--	src/lingot-background.xpm\
--	src/lingot-logo.xpm\
--	intltool-extract.in\
--	intltool-merge.in\
--	intltool-update.in
-+	MAINTAINERS
- 
- EXTRA_DIST = $(lingotdoc_DATA)
- 
diff --git a/media-sound/lingot/files/lingot-1.0.1-configure.patch b/media-sound/lingot/files/lingot-1.0.1-configure.patch
new file mode 100644
index 000000000000..f39dc3d9ad55
--- /dev/null
+++ b/media-sound/lingot/files/lingot-1.0.1-configure.patch
@@ -0,0 +1,217 @@
+From 916ed65b3901731fff02eceadcbc5b18f4c27d6f Mon Sep 17 00:00:00 2001
+From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
+Date: Sat, 14 Jul 2018 09:40:37 +0200
+Subject: [PATCH] Remove unused variables from configure.ac.
+
+Also replace
+  configure.ac: NO_PREFIX_PACKAGE_FOO_DIR = "share/foo"
+  configure.ac: AC_SUBST(NO_PREFIX_PACKAGE_FOO_DIR)
+and
+  Makefile.am : .. = $(prefix)/@NO_PREFIX_PACKAGE_FOO_DIR@
+with
+  Makefile.am : .. = $(datadir)/foo
+for simplicity and conformity with the usual meaning of datadir.
+
+These changes may require regeneration by Anjuta.
+---
+ Makefile.am       |  2 +-
+ configure.ac      | 85 -----------------------------------------------
+ icons/Makefile.am |  2 +-
+ 3 files changed, 2 insertions(+), 87 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index db5ec16..d61162f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -27,7 +27,7 @@ DISTCLEANFILES = \
+ 	m4/* \
+ 	po/Makefile.in.in
+ 
+-gnomemenudir = $(prefix)/@NO_PREFIX_PACKAGE_MENU_DIR@
++gnomemenudir = $(datadir)/applications
+ gnomemenu_DATA = org.nongnu.lingot.desktop
+ appdatadir = $(datadir)/metainfo
+ appdata_DATA = org.nongnu.lingot.appdata.xml
+diff --git a/configure.ac b/configure.ac
+index 08f208f..cfb1259 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -162,90 +162,6 @@ if test "x$uselibfftw" = "xyes"; then
+  fi
+ fi
+ 
+-
+-dnl PKG_CHECK_MODULES([GLADE], [libglade-2.0])
+-dnl AC_SUBST(GLADE_CFLAGS)
+-dnl AC_SUBST(GLADE_LIBS)
+-
+-dnl Set PACKAGE_LOCALE_DIR in config.h.
+-if test "x${prefix}" = "xNONE"; then
+-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [Package local directory])
+-else
+-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", [Package local directory])
+-fi
+-
+-dnl Set PACKAGE SOURCE DIR in config.h.
+-packagesrcdir=`cd $srcdir && pwd`
+-
+-dnl Set PACKAGE PREFIX
+-if test "x${prefix}" = "xNONE"; then
+-  packageprefix=${ac_default_prefix}
+-else
+-  packageprefix=${prefix}
+-fi
+-
+-dnl Set PACKAGE DATA & DOC DIR
+-packagedatadir=share
+-packagedocdir=doc/${PACKAGE}
+-
+-dnl Set PACKAGE DIRs in config.h.
+-packagepixmapsdir=share/pixmaps/${PACKAGE}
+-packageicondir=share/icons/hicolor/scalable/apps/
+-packagehelpdir=share/gnome/help/${PACKAGE}
+-packagemenudir=share/applications
+-
+-dnl Subst PACKAGE_DATA_DIR.
+-NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
+-AC_SUBST(NO_PREFIX_PACKAGE_DATA_DIR)
+-PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}"
+-AC_SUBST(PACKAGE_DATA_DIR)
+-
+-dnl Subst PACKAGE_DOC_DIR.
+-NO_PREFIX_PACKAGE_DOC_DIR="${packagedocdir}"
+-AC_SUBST(NO_PREFIX_PACKAGE_DOC_DIR)
+-PACKAGE_DOC_DIR="${packageprefix}/${packagedocdir}"
+-AC_SUBST(PACKAGE_DOC_DIR)
+-
+-dnl Subst PACKAGE_PIXMAPS_DIR.
+-NO_PREFIX_PACKAGE_PIXMAPS_DIR="${packagepixmapsdir}"
+-AC_SUBST(NO_PREFIX_PACKAGE_PIXMAPS_DIR)
+-PACKAGE_PIXMAPS_DIR="${packageprefix}/${packagepixmapsdir}"
+-AC_SUBST(PACKAGE_PIXMAPS_DIR)
+-
+-dnl Subst PACKAGE_ICON_DIR.
+-NO_PREFIX_PACKAGE_ICON_DIR="${packageicondir}"
+-AC_SUBST(NO_PREFIX_PACKAGE_ICON_DIR)
+-PACKAGE_ICON_DIR="${packageprefix}/${packageicondir}"
+-AC_SUBST(PACKAGE_ICON_DIR)
+-
+-dnl Subst PACKAGE_HELP_DIR.
+-NO_PREFIX_PACKAGE_HELP_DIR="${packagehelpdir}"
+-AC_SUBST(NO_PREFIX_PACKAGE_HELP_DIR)
+-PACKAGE_HELP_DIR="${packageprefix}/${packagehelpdir}"
+-AC_SUBST(PACKAGE_HELP_DIR)
+-
+-dnl Subst PACKAGE_MENU_DIR.
+-NO_PREFIX_PACKAGE_MENU_DIR="${packagemenudir}"
+-AC_SUBST(NO_PREFIX_PACKAGE_MENU_DIR)
+-PACKAGE_MENU_DIR="${packageprefix}/${packagemenudir}"
+-AC_SUBST(PACKAGE_MENU_DIR)
+-
+-dnl AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packageprefix}/${packagedatadir}")
+-dnl AC_DEFINE_UNQUOTED(PACKAGE_DOC_DIR, "${packageprefix}/${packagedocdir}")
+-dnl AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packageprefix}/${packagepixmapsdir}")
+-dnl AC_DEFINE_UNQUOTED(PACKAGE_HELP_DIR, "${packageprefix}/${packagehelpdir}")
+-dnl AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}")
+-dnl AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
+-
+-
+-AC_DEFINE([PACKAGE_DATA_DIR], [share], [Package data dir])
+-AC_DEFINE([PACKAGE_DOC_DIR], [doc], [Package doc dir])
+-AC_DEFINE([PACKAGE_HELP_DIR], [doc], [Help])
+-AC_DEFINE([PACKAGE_MENU_DIR], [], [Menu])
+-AC_DEFINE([PACKAGE_ICON_DIR], [icons], [Icons])
+-AC_DEFINE([PACKAGE_SRC_DIR], [src], [Source])
+-
+-
+ AC_CONFIG_FILES([
+ Makefile
+ po/Makefile.in
+@@ -254,4 +170,3 @@ icons/Makefile
+ test/Makefile
+ ])
+ AC_OUTPUT
+-
+diff --git a/icons/Makefile.am b/icons/Makefile.am
+index 9588562..0b17692 100644
+--- a/icons/Makefile.am
++++ b/icons/Makefile.am
+@@ -4,7 +4,7 @@
+ ## If you don't want it to overwrite it,
+ ## 	Please disable it in the Anjuta project configuration
+ 
+-lingot_iconsdir = $(prefix)/@NO_PREFIX_PACKAGE_ICON_DIR@
++lingot_iconsdir = $(datadir)/icons/hicolor/scalable/apps
+ 
+ lingot_icons_DATA = \
+ 	org.nongnu.lingot.svg
+From 0d65c3c71000a1f234288af4d703af888d569fd1 Mon Sep 17 00:00:00 2001
+From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
+Date: Sat, 14 Jul 2018 09:07:52 +0200
+Subject: [PATCH] Stop generating the desktop file.
+
+Drop the absolute path, and allow the icon to be found dynamically.
+This makes adding bitmaps additionally to the SVG easier later as well.
+---
+ configure.ac                                              | 1 -
+ org.nongnu.lingot.desktop.in => org.nongnu.lingot.desktop | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+ rename org.nongnu.lingot.desktop.in => org.nongnu.lingot.desktop (86%)
+
+diff --git a/configure.ac b/configure.ac
+index 5f1ea03..08f208f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -252,7 +252,6 @@ po/Makefile.in
+ src/Makefile
+ icons/Makefile
+ test/Makefile
+-org.nongnu.lingot.desktop
+ ])
+ AC_OUTPUT
+ 
+diff --git a/org.nongnu.lingot.desktop.in b/org.nongnu.lingot.desktop
+similarity index 86%
+rename from org.nongnu.lingot.desktop.in
+rename to org.nongnu.lingot.desktop
+index 76842ce..8b3524f 100644
+--- a/org.nongnu.lingot.desktop.in
++++ b/org.nongnu.lingot.desktop
+@@ -6,7 +6,7 @@ Comment=LINGOT Is Not a Guitar-Only Tuner
+ Comment[cs]=(Nejen kytarová) ladička
+ Comment[fr]=Un accordeur de guitare, mais pas que
+ Exec=lingot
+-Icon=@PACKAGE_ICON_DIR@/org.nongnu.lingot.svg
++Icon=org.nongnu.lingot.svg
+ Terminal=false
+ Type=Application
+ Categories=GNOME;GTK;AudioVideo;
+From 29691022bae3180cc021ad7b97023dd483be19de Mon Sep 17 00:00:00 2001
+From: Iban Cereijo <ibancg@users.noreply.github.com>
+Date: Wed, 18 Jul 2018 13:59:25 +0200
+Subject: [PATCH] Putting the desktop file in the distributed files.
+
+---
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index d61162f..d359df3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,7 +10,6 @@
+ lingotdocdir = ${docdir}
+ lingotdoc_DATA = \
+ 	README \
+-	COPYING \
+ 	AUTHORS \
+ 	ChangeLog \
+ 	NEWS \
+@@ -37,6 +37,7 @@ dist_man_MANS = lingot.1
+ 
+ EXTRA_DIST = \
+ 	$(lingotdoc_DATA) \
++	$(gnomemenu_DATA) \
+ 	$(appdata_DATA) \
+ 	build-aux/gitlog-to-changelog \
+ 	bootstrap
diff --git a/media-sound/lingot/lingot-0.9.1.ebuild b/media-sound/lingot/lingot-0.9.1.ebuild
deleted file mode 100644
index 43092c2c4111..000000000000
--- a/media-sound/lingot/lingot-0.9.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="LINGOT Is Not a Guitar-Only Tuner"
-HOMEPAGE="http://www.nongnu.org/lingot"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa jack"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	dev-libs/glib:2
-	gnome-base/libglade:2.0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-clean-install.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable alsa) \
-		$(use_enable jack)
-}
-
-src_install() {
-	emake DESTDIR="${D}" lingotdocdir="/usr/share/doc/${PF}" install
-}
diff --git a/media-sound/lingot/lingot-1.0.1.ebuild b/media-sound/lingot/lingot-1.0.1.ebuild
new file mode 100644
index 000000000000..523ec2ba532c
--- /dev/null
+++ b/media-sound/lingot/lingot-1.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Accurate, easy to use, and highly configurable musical instrument tuner"
+HOMEPAGE="https://www.nongnu.org/lingot/"
+SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa +fftw jack pulseaudio"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( sci-libs/fftw:3.0= )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-configure.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myemakeargs=(
+		$(use_enable alsa)
+		$(use_enable fftw libfftw)
+		$(use_enable jack)
+		$(use_enable pulseaudio)
+	)
+
+	econf "${myemakeargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" lingotdocdir="/usr/share/doc/${PF}" install
+}
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
new file mode 100644
index 000000000000..193d0b90b5eb
--- /dev/null
+++ b/media-sound/lollypop/Manifest
@@ -0,0 +1,3 @@
+DIST lollypop-0.9.601.tar.xz 376712 BLAKE2B d3747a1e994cd8de816eed49d87a8f279394981f14e2de82785203ba5ec0e71604a569f5f3e8e57da55f9bf62066da15232d46a0d117d094c6638b6608491620 SHA512 d13bd50f6b591a0f6491010817833d345a7fe1e63ef0eaab2ebad7c877990cf5e2dfba62911a690d223d912750a150fda40be81ca9a094968ed4796c1ed66f65
+EBUILD lollypop-0.9.601.ebuild 1269 BLAKE2B 98923c79b2abdde170987deec5a8811d4fdd6286f27477df42c0981292cef185c4032e0d535c75a12e2ffaf00f3ba6e3d31606a04dab85495530a966fc2736af SHA512 f674df9851ad36ed5e8d83a586e037825759d4fe66ff3711bb1f886fa53e0a905bd49081b6e643e70f36b86919b99685feb15925a3e1545993bdbb66f36f7324
+MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-0.9.601.ebuild b/media-sound/lollypop/lollypop-0.9.601.ebuild
new file mode 100644
index 000000000000..2e53e4c81d53
--- /dev/null
+++ b/media-sound/lollypop/lollypop-0.9.601.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+HASH="93d895a6c74c64aaa9d4cdc4d58bd6e6"
+inherit python-r1 gnome2-utils meson xdg-utils
+
+DESCRIPTION="Modern music player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
+SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+CDEPEND="${PYTHON_DEPS}
+	dev-libs/appstream-glib[introspection]
+	dev-libs/glib:2
+	dev-libs/gobject-introspection[cairo]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	gnome-base/gnome-common
+	x11-libs/gtk+:3
+"
+DEPEND="${CDEPEND}
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	dev-util/intltool
+"
+RDEPEND="${CDEPEND}
+	app-crypt/libsecret
+	dev-libs/totem-pl-parser
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/dbus-python
+	>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
+"
+
+RESTRICT="test"
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/lollypop/metadata.xml b/media-sound/lollypop/metadata.xml
new file mode 100644
index 000000000000..15fd2f3a22be
--- /dev/null
+++ b/media-sound/lollypop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index 8e9660de6f6a..e83db43df7e0 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,4 +1,4 @@
-AUX musepack-tools-465-gentoo.patch 1550 BLAKE2B 8366eb045ea252e3c375d6ae17a485e4fb1d35bf3768a4c3335cfedb1a7e8d9a9d210a18f09d2800d8a26ec008cba7ac74751dea76257327e37f97ecd8662dec SHA512 464513d49a290967b1fee8f9c27569e4b0b7004ddd5856f80dee9935a8ed4eeacabe48021f403136df0079a216b7da149edfea5079fa41eecd8caeaa13344369
+AUX musepack-tools-465-gentoo.patch 1558 BLAKE2B 292111fc2b795a98cc2c1926b63799114e4b6ea2c11aa9ddee78c24332181ac9d5c4ab403398470014b5f33cf246def98214026d0def5979e11df2a1e2747050 SHA512 c260e1f96fa4ab79f09d78f16ede4522a802f703d565cf6db974b918e8db48233211a561ce64e0e8bc7cbd177ebf2986c46e5c9811ac15515f8126458c15b0af
 DIST musepack-tools-465.tar.bz2 167612 BLAKE2B 0748cbfaecec396a4bf054aac5a451f16386becae75cdbb63821c28f7b7d378723df180d909eb3b9e0c7eafa79996dbe7aaab251721fd139b81755e7f59249f1 SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54
-EBUILD musepack-tools-465-r1.ebuild 829 BLAKE2B 2e218114b9d16693d01abb12f81b0412c2b03e81b2ab5ea741b1641c79d527950d6df9c7b64dbc2bcc8b0ba15632c7635071f3ccb2ae6d53f38687d8f8a9196a SHA512 dabc121e5154fad169adcfbf91f50f5f68afec703c5b01758fb24ac147f5fd8be652cd9c2a1a30184dc855fca4f52d0ae2ce1599794d63b2771d697171a0f612
+EBUILD musepack-tools-465-r1.ebuild 831 BLAKE2B e7c82080b80a25de3fe681156671deaae8fef0408e133c4ffdef1fe6739a500508a4508faf804a0c5390b9ac1d41b840a8d476a65a36ba826c2eb0eb79401260 SHA512 344fbc7f46cfc66df17e6119880101358c9d4fe1841f91b44f9260c96afc9614d367d62aaea6d2ee32e042e906c6faf000595a3a468c9cfcca4a32d0338852ec
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
index a93b5ebddadd..51df29910742 100644
--- a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
+++ b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -15,10 +15,6 @@
  
  add_definitions(-DFAST_MATH -DCVD_FASTLOG)
@@ -11,8 +11,8 @@
  add_subdirectory(libmpcdec)
  add_subdirectory(libmpcpsy)
  add_subdirectory(libmpcenc)
---- libmpcdec/CMakeLists.txt
-+++ libmpcdec/CMakeLists.txt
+--- a/libmpcdec/CMakeLists.txt
++++ b/libmpcdec/CMakeLists.txt
 @@ -1,7 +1,22 @@
  include_directories(${libmpc_SOURCE_DIR}/include)
  if(SHARED)
diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
index f4f7e4eb5104..ebfe9885e1a3 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit cmake-multilib
 
 # svn export http://svn.musepack.net/libmpc/trunk musepack-tools-${PV}
 # tar -cjf musepack-tools-${PV}.tar.bz2 musepack-tools-${PV}
 
 DESCRIPTION="Musepack SV8 libraries and utilities"
-HOMEPAGE="http://www.musepack.net"
+HOMEPAGE="https://www.musepack.net"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD LGPL-2.1"
@@ -16,10 +17,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
+DEPEND="
+	>=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
 	>=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}
 	!media-libs/libmpcdec
-	!media-libs/libmpcdecsv7"
-DEPEND="${RDEPEND}"
+	!media-libs/libmpcdecsv7
+"
 
 PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index 0f2a15e36dee..7b707e80137c 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1,7 +1,6 @@
 AUX fix-missing-gint.patch 629 BLAKE2B 934363d22d7f7fb4eb8f0116418a703d83c50847b249623fe313f007d58a54b99691b611b76b6fcee714d5df9e73d21d25ea4914bd66096cf12e645f28fe703c SHA512 66aaa515cbb7a76f6f87fa527723cc60082ed77efeb02cb8fef784be3ab8a8fbec37ec61d7ff67c4b0cc0074cc281dd238c19cb1fb7686e57bb274b226dc25c9
-DIST pasystray-0.2.1.tar.bz2 100456 BLAKE2B 8cf7aa97a20062dffac59969a7b8d1d71e6fdaafd4e944b2ed3444f50fc1a70ab07f1c3e9c349115c8e50d1bf11093649ee41300590934bc4f71fd752b5aa1c2 SHA512 db7c05c2eb5fd3dada2e3c23f28978497d17a2147078390ab3e8c88654c4bd8ce48d07a15e9a5b3834acffcc2d86fa719ce2403255915bdfb2eb610bd0549041
 DIST pasystray-0.6.0.tar.gz 53835 BLAKE2B ef5abab45a17f6445e8cbd1e37c300aa2c1c25bee3d684d05263b02a507badb1d5ce7a1c76bed94d255e4f2d5e2f18bdfd749e83e98273a52d42ffb12a32f115 SHA512 51fdb5aab22ad10ffe73f6de68115ee1559f09f58cfe4d5201a2f262323ca3476a8b09c7fc02c4144414f44444661edd25d2d39b3de54ed4c662660867da622c
-EBUILD pasystray-0.2.1.ebuild 879 BLAKE2B 978299c671a5e877c78db6903b0a00cd89a6c70964bac36c6e3b0fbbab46b5b1b8b0fefb577308d7a8009602d849080121974ccea3cf20e70a66d0cd2d5219d2 SHA512 f74684712b6d36c901c70c69953b98947eda6e79e88e78e743f0de183bd6253d9bc6d71938ceb9f6bcefd9771783555fff1749cef1f8def7dacc2d559e5ad418
-EBUILD pasystray-0.6.0-r1.ebuild 1043 BLAKE2B 780ca6c4f8585e76acfa5e82d78ac757fc22f501c83b0c21feaa522e3ef13300806080f2b11c434dff71d95449e24fc6d4b0c56679d7b0a582e22c879673246c SHA512 534ffc663633ba4cc9c7f539db311e35dd973ffc08a76b5638dc32e4d48999583e73c94863e1937ac8e66af05816e20de447e557569e86f4e06f043698f7d0b7
+DIST pasystray-0.7.0.tar.gz 56014 BLAKE2B cba947895fc71a18a43c314486ec3513e844b1df426d0104f321c8ecd28199b6b4adf69f5c10146470a74c5e6f74f505833bd00c4541399a162ddcfb8aac4701 SHA512 a98dae85640c0640f921173cf5a794963e974af64a7a972bbc2a53e69060895b55494934bc1fcfd957f0c94ca90e4d52634bf444e841b2a0a57434e05500161b
 EBUILD pasystray-0.6.0-r2.ebuild 1098 BLAKE2B db682d8aeb9c5897bd8cfc636d48c08a9836c6a36c9a04dd7ef1c5b05829ddfdec7b122c2021acf0a8999e9c3c0451aae9f47c5385b06243ff6a69fbda86eeb7 SHA512 6a11e33c0ce6cd4f4272978d2371b219e697c554b32a3596519eb9be7b621d3e5aff01ff308b8e912d53be4d767fc2f9e4ded71bf47244ca2d5379fc43e3c4b7
+EBUILD pasystray-0.7.0.ebuild 1003 BLAKE2B 693733b47c7195d7318c89d38873d1895c674c75246ea67ea2cb82a4da21ec694afe08d062a20f2db710144bca3956ef4236911545fa16c01029ccc264c04621 SHA512 3d2c727b59605700b57e5c13cdb8ac1823b871c3efe57a8bf9ad0284c41dfc11aba99b4fc3aecc22842f612551cc07d1a113585688e9f983a9f75830ce6e0fea
 MISC metadata.xml 635 BLAKE2B 54e8f3a6f865a0caafaf253e37c517e84c5a41414c2456d34780522c25b8998cd50b2306e24d55e9c6c45e4e62bf6fc60e2f5098f63fd23e42778b0b067cb922 SHA512 97fb650bc38171c10b3678940a72b5100874aa84820b962e1b892d82555c8527bf19976076fa0017c400d7955716e7eb4747bcd8cc372198b5c84f6ec4086495
diff --git a/media-sound/pasystray/pasystray-0.2.1.ebuild b/media-sound/pasystray/pasystray-0.2.1.ebuild
deleted file mode 100644
index 3ce386fe140d..000000000000
--- a/media-sound/pasystray/pasystray-0.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnome2-utils
-
-DESCRIPTION="A system tray for pulseaudio controls (replacement for the deprecated padevchooser)"
-HOMEPAGE="https://github.com/christophgysin/pasystray"
-SRC_URI="mirror://github/christophgysin/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-
-RDEPEND="
-	|| ( >=media-sound/pulseaudio-1.0[glib,avahi] >=media-sound/pulseaudio-5.0-r3[glib,zeroconf] )
-	>=net-dns/avahi-0.6
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS README TODO"
-
-src_configure() {
-	econf $(use_enable libnotify notify)
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/pasystray/pasystray-0.6.0-r1.ebuild b/media-sound/pasystray/pasystray-0.7.0.ebuild
index 2730461f08c8..2a40a2718dc9 100644
--- a/media-sound/pasystray/pasystray-0.6.0-r1.ebuild
+++ b/media-sound/pasystray/pasystray-0.7.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome2-utils autotools vcs-snapshot xdg
+
+inherit gnome2-utils autotools xdg
 
 DESCRIPTION="PulseAudio system tray"
 HOMEPAGE="https://github.com/christophgysin/pasystray"
@@ -10,20 +11,22 @@ SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="libnotify zeroconf"
 
 RDEPEND="
 	>=dev-libs/glib-2.48.2
 	>=media-sound/pulseaudio-5.0-r3[glib,zeroconf?]
-	zeroconf? ( >=net-dns/avahi-0.6 )
 	x11-libs/gtk+:3
 	x11-libs/libX11
+	zeroconf? ( >=net-dns/avahi-0.6 )
 	libnotify? ( >=x11-libs/libnotify-0.7 )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+S=${WORKDIR}/${PN}-${P}
+
 src_prepare() {
 	default
 	eautoreconf
@@ -35,11 +38,6 @@ src_configure() {
 		$(use_enable zeroconf avahi)
 }
 
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 20fe3889c0e6..88d436dc975f 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,8 +1,6 @@
 AUX picard-2.0.3-crashfix.patch 639 BLAKE2B 2476104b4d1cb73cf1a88f006d88dcb598a5394794b9d28281b51a9661e5d8bed3a6693c98d8e84420980b98aabebae8430d6dc92478c2ab2c6d2d4a85a03cc6 SHA512 80380f0151b0ea5c3eea03d4f0e1a318c422d454324bdd403788e1553b129d9e3c41d79ffe4f74f492f752fb8e66ae6a53817ae4469a9066d2adc31e869b4ee8
 AUX picard-2.0.3-iteration-error.patch 904 BLAKE2B dfd8f64219a17cfa3ed5550eb5dfe4b268eaa09b28f493ccdb37da865d8d8d59f218a0c4d87b15013954bf3cf272d5776cc722a6fd47254a35d54f7d17d68e85 SHA512 b13e65e46a8fe0930473a76e414ac55443bf32516728221f902767510442807d5d2ddf70e15df1a851a31458876f578a270e630c0402379ff8f517b84be01865
-DIST picard-2.0.0_beta3.tar.gz 2686246 BLAKE2B e11cc85282bb3dfe7298090e42b62f7e9b2d4ee7df09b040905665694074ede611884e1544abc89aa3d07e0844d6599d5fac7c0db09bad7d9e64439c0c4478c9 SHA512 c8c5bdd84af3946bc24eb495bcb83877dffedb81e6ff64742925f6d1b4f2780f86280dda839d96030ea15ee2a7bf7708c20cc4ac92e97bf9cd372ea36715d156
 DIST picard-2.0.3.tar.gz 2748358 BLAKE2B ff71f9d7836b9f797a539db772e2ffcb8cb9ba4c25997c01590292bf1b7b5d311089174313af86f1eb0e82af48bc8f350578ae6bdffba3c6b3bf98b934481f8d SHA512 759252fa3c43af1bfc09d85ef90fe451e674bfebaee31838bd2779380d1b8ad817f899896baeccf583464566eb2acfe886c8288d1757faaaff2dc17c3b8ef6ae
-EBUILD picard-2.0.0_beta3.ebuild 1774 BLAKE2B 0dd094c47179e50704a8431322051a1942cbebf34ebd171f27823734b34103dc7427b13fce2714297cb7f811a62cbf90595212dc3b0205a0c55cb02be9ebb2fa SHA512 2f6936e6544930d2d60eec787e6a0f8cc36b49f891269448b0b308c9595aa5d9441012fe2f6eafa9d30fc40f647e9c74bc0e844f9323248f5477b562157cb768
-EBUILD picard-2.0.3.ebuild 1864 BLAKE2B 54931c2fcb87851c1e050844297b2f864cc39856afef8c6181a90811b96e97d8b121aa028444b8425dd884ab415cad007cabf9c5b3569f3053cb5e57fc1747fe SHA512 407c1bead0ed119f9ec81d40040c014a4111530e9298b76c57bfe056c8a09b7bd1afe8a4ecbb817563c95aec0b749eacb2a5b663c3a2e968ac91745709e8e957
+EBUILD picard-2.0.3.ebuild 1860 BLAKE2B ae08290f7560ae4cc709c6d09864076b3167c335399ea92950b8ec4464ab700f8285124c77605ada1491404e4509bcf405b040e65316541a91b1f3e434b6b3f0 SHA512 d9113e15846984d10eca61bb0181a2615c80055034aa07b30d54e1aac12865bf4a86bd41e95561dcf59a7676951b244e1c228dedacf8d137bdbd3f050a1859cd
 EBUILD picard-9999.ebuild 1698 BLAKE2B e2a3f8d9f18bc4560afa0dd926487d5a7ba1d609870c67cfd569c71ba25f623613796ee3fe61c3d2884670af6c64a609e12d7ba2667f64a6bcb87eb1724eea6d SHA512 d780f2c5855f59314d86089eed73b60c35dbe0083198b38bb4b61231affa31c3a7fc184083c593e3fde6c39cb4f4e561d2bc10d4bd57cd7226187bd9e3c60b75
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-2.0.0_beta3.ebuild b/media-sound/picard/picard-2.0.0_beta3.ebuild
deleted file mode 100644
index b4fa7700a16a..000000000000
--- a/media-sound/picard/picard-2.0.0_beta3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-DISTUTILS_SINGLE_IMPL=1
-DISABLE_AUTOFORMATTING=true
-
-inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="A cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-SRC_URI="https://github.com/metabrainz/${PN}/archive/${PV/_beta3/dev6}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
-	dev-qt/qtgui:5[accessibility]
-	>=media-libs/mutagen-1.38"
-DEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-RESTRICT="test" # doesn't work with ebuilds
-
-S="${WORKDIR}/${P/_beta3/dev6}"
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
-calculation and lookup of AcoustID fingerprints.
-
-Install optional package dev-python/python-discid to enable
-calculation and lookup of compact disc identifiers (disc IDs).
-
-If you are upgrading Picard and it does not start, try removing
-Picard's settings:
-	rm ~/.config/MusicBrainz/Picard.conf"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/picard/picard-2.0.3.ebuild b/media-sound/picard/picard-2.0.3.ebuild
index f3bbe1494326..c81de29bc6b7 100644
--- a/media-sound/picard/picard-2.0.3.ebuild
+++ b/media-sound/picard/picard-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/metabrainz/${PN}/archive/release-${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index a7adbf187054..721fceda0576 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -3,9 +3,11 @@ DIST pragha-1.3.90.tar.bz2 760153 BLAKE2B 22cb90225cad5b19ecd95691bafd11f55b35e5
 DIST pragha-1.3.91.1.tar.bz2 755933 BLAKE2B db24a8752cfc52ded17a15555f3e39f2792c4f9717bca75a158d4672812fbee8d502149c08daa15113aa0de0fb1fe6f417d8a36c1b1b98c73f47d0319edca0a9 SHA512 ec0617ce0e1ead5ce2783c7bfb26cc4a2fc3f15a6f79ba887a02fc8a3dd01551ff91a41e90acc7fb23793a2261a340acdb80b9268fd08b5fa7dd26dd337fb07b
 DIST pragha-1.3.91.tar.bz2 740279 BLAKE2B c42f1b6d0c7071b56080d8feb8a11c9ba00b1339bc653a61cc80f09e1f076b2183091dbe2cbc42e7aa7347826492fa77cbbac980c25999ce3968a8e74dbc3623 SHA512 49b03ef69e7d12086e324a2088b4540eaebc01fd56247c43f069bd1b9fadbdd1b5f27af87b5086cc3e9a957281c3f7ff72c8ce3b0a6474514714a017ca5e0ab5
 DIST pragha-1.3.92.tar.bz2 764105 BLAKE2B f90dd45064d9ae7169bcb1f671e22da716560b3eb31caaff962a0eb5aa928f857200c61782bd90a54d660c21c4b3158cd6d224f4824939abdc572e7513c89b67 SHA512 8d166074dd3c1b2fa9a6f75e7bef222e09a2913a441c5ed90df6c431b7d3ab877e586b7df1adbba221656a52cd1630ad7bcfbb3f4fab762a8d8f9fa67b2842b9
+DIST pragha-1.3.99.tar.bz2 781892 BLAKE2B 9d73dd2859db0c7ab7ac66fdafe873bd78b019408682828ddd05aa18a1591576df667e326037a7ca28eaed227fcbce943209fad16c9f55bb38c0c2c808275104 SHA512 df032fe16932ad464417306d8d01373b8e415f5f810a06b1baff647a395b10bdee5c912f36a3f6e3ea6a0e04d399257e202112c1838444d23dfc17b5fd34e12b
 EBUILD pragha-1.3.3.ebuild 2288 BLAKE2B 0cad8db3ec862e8e731135eb2e53c2e6fadcc397476512153b1d72531eb74521b4f97c99c3a929f8968046ec98581a41719e75c0c8bee5dd15e2d77a9c7c0215 SHA512 90a7562ed5be7146fb86ea61befd6d145230235020d88f99a0762d2749b05640591343e680b3580654840ebb34ff1c9b1174ee28f73e28fe79c030ab739c6f73
 EBUILD pragha-1.3.90.ebuild 2502 BLAKE2B ad6086767bf4d14ba02311377ee5009ca66e8a87265119f1476191c81641867804eaa7484b7c04133ca82e4651b4e1cc45f1820227c7d6fa3be609fe2122197f SHA512 27c0cbe0ed8ad4bdb76a0d18dd0d60bdacac7506f36bc68165675c17845b514cdd5a913be34702809b6186a0d26e40fb412e36d1faed1bdd1f86335fcb737d8d
 EBUILD pragha-1.3.91.1.ebuild 2591 BLAKE2B 510d140f805df182ed3313410f798aa004281f9827d7911715e08083b8e88e0d757e4aa51298c3f13e2edd0ad70a35eb6a8b6b8aecde5c342bec57e28dd4280a SHA512 3dd07e0038eed6ec79b6919a63cb6a79feb04a08d3bf44d4b2dda746cea5f7ac35a1b0b80594aa304de275a33d0262753868a83abadcf6d42ef900c961ff2b95
 EBUILD pragha-1.3.91.ebuild 2591 BLAKE2B 510d140f805df182ed3313410f798aa004281f9827d7911715e08083b8e88e0d757e4aa51298c3f13e2edd0ad70a35eb6a8b6b8aecde5c342bec57e28dd4280a SHA512 3dd07e0038eed6ec79b6919a63cb6a79feb04a08d3bf44d4b2dda746cea5f7ac35a1b0b80594aa304de275a33d0262753868a83abadcf6d42ef900c961ff2b95
 EBUILD pragha-1.3.92.ebuild 2591 BLAKE2B 510d140f805df182ed3313410f798aa004281f9827d7911715e08083b8e88e0d757e4aa51298c3f13e2edd0ad70a35eb6a8b6b8aecde5c342bec57e28dd4280a SHA512 3dd07e0038eed6ec79b6919a63cb6a79feb04a08d3bf44d4b2dda746cea5f7ac35a1b0b80594aa304de275a33d0262753868a83abadcf6d42ef900c961ff2b95
+EBUILD pragha-1.3.99.ebuild 2591 BLAKE2B 3ea0da51e0ffe4fee16e69d92e39143666817c9031c037be0fca13de5d457819fa348b0d7258651f67e888d265d9396f4db8ead768bfcd8c4c04f58a06ed50e2 SHA512 d83414ca8e3d34357d9b123dbb4ab19d663ea529f6898437404108d9394b061dde8d1bb0a3219f9a8e3bebe0ff8cfd7973fb80ced341d7955363f8f3d63ff06d
 MISC metadata.xml 1215 BLAKE2B d7a5bf01af7aa7047342f674cc33ee8ad9ea20dd9b0a496f1954830057bc51932530755429d54faa599da6b2817907100057153436a47a731892a8d8f91aece3 SHA512 9700873ef8ee962e9ba0057d8489b22e73ebaf55a6bda1cd58f062167f15f1b8d08e0c9061e45b4fd71040932e394a9006c00a95a944bf45ef7b65d48f922f34
diff --git a/media-sound/pragha/pragha-1.3.99.ebuild b/media-sound/pragha/pragha-1.3.99.ebuild
new file mode 100644
index 000000000000..54229d1b0085
--- /dev/null
+++ b/media-sound/pragha/pragha-1.3.99.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="A lightweight music player (for Xfce)"
+HOMEPAGE="https://github.com/pragha-music-player/pragha"
+SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda +glyr grilo +keybinder koel lastfm libnotify mtp +peas +playlist rygel soup +udev"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
+	>=dev-libs/glib-2.42:=
+	media-libs/gstreamer:1.0=
+	media-libs/gst-plugins-base:1.0=
+	>=media-libs/taglib-1.8:=
+	>=x11-libs/gtk+-3.14:3=
+	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
+	cdda? ( >=dev-libs/libcdio-0.90:=
+		>=dev-libs/libcdio-paranoia-0.90:=
+		>=media-libs/libcddb-1.3.0:= )
+	glyr? ( >=media-libs/glyr-1.0.1:= )
+	grilo? ( media-libs/grilo:0.3=[network] )
+	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
+	koel? ( dev-libs/json-glib:= )
+	lastfm? ( >=media-libs/libclastfm-0.5:= )
+	libnotify? ( >=x11-libs/libnotify-0.7.5:= )
+	mtp? ( >=media-libs/libmtp-1.1.0:= )
+	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
+	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
+	rygel? ( >=net-misc/rygel-0.26:= )
+	soup? ( >=net-libs/libsoup-2.38:= )
+	udev? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	>=dev-util/xfce4-dev-tools-4.10
+	sys-devel/gettext
+	virtual/pkgconfig
+	xfce-base/exo"
+REQUIRED_USE="glyr? ( peas )
+	grilo? ( peas )
+	koel? ( soup )
+	libnotify? ( peas )
+	mtp? ( udev )
+	rygel? ( peas )
+	soup? ( peas )
+	udev? ( peas )"
+
+src_configure() {
+	local myconf=(
+		$(use_enable peas libpeas-1.0)
+		$(use_enable glyr libglyr)
+		$(use_enable lastfm libclastfm)
+		$(use_enable cdda libcdio)
+		$(use_enable cdda libcdio_paranoia)
+		$(use_enable cdda libcddb)
+		$(use_enable playlist totem-plparser)
+
+		$(use_enable libnotify)
+		$(use_enable keybinder)
+		$(use_enable udev gudev-1.0)
+		$(use_enable mtp libmtp)
+		$(use_enable koel json-glib-1.0)
+		$(use_enable soup libsoup-2.4)
+		$(use_enable rygel rygel-server-2.6)
+		$(use_enable grilo grilo-0.3)
+		$(use_enable grilo grilo-net-0.3)
+		# avoid trying to use 0.2 & 0.3 simultaneously
+		# https://github.com/pragha-music-player/pragha/issues/124
+		--disable-grilo-0.2
+		--disable-grilo-net-0.2
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/quimup/Manifest b/media-sound/quimup/Manifest
index d81dfcdef553..b562d5a958e3 100644
--- a/media-sound/quimup/Manifest
+++ b/media-sound/quimup/Manifest
@@ -1,6 +1,3 @@
-AUX quimup-1.4.0-qdatastream.patch 298 BLAKE2B 4268dead71539c993f1cf3a32e57d4600e71b964ce71d6412589c0c58ec3cfb57adf09d11d4b216ff8501fe2ce983737cfd650b2cc3a3b868207627ed0efeffa SHA512 04cd65acabdeee81a7002a3a9402213d842ae1aea52832549ebfa1037c9279ab4e2e3503f4fc6c0fd410d974b00838da6214fe1f11df311d57c15dc51a7e5abb
-DIST quimup_1.4.0_src.tar.gz 225621 BLAKE2B 2ee93c8bd7a674c2e86b4d6779e76deb0a86abe6ce4794acf416a4f24ce013b6e068718763a97592809bfb89168b98a1450765a7e1ba0e2a0cbff5fbeb10f58a SHA512 e5351d33a8082371fa50914381fcb7d0b15fe2d8d65feab64774c2d85476b6135d199a17bf125d2e39fa64916bc3d31da1ba5eec6b274ff6298e0b93237f8b61
 DIST quimup_1.4.3_source.tar.gz 587260 BLAKE2B ee2ce0d9f71c63db73af00fe385d643f5ec08e322137c0c4d372fec68b875587e0f46ca2a46d9afc366afdd29e5381816457e4b3b3891af8c0113c577385aa23 SHA512 fb3727bf5c0f756c888484f7c061da95a1ece15673079ac8e6ffc82289f78cfce3dda7245ae25b1d705ffe057f1b0930baf2338bdfe0f16c900dc1ffd3fef807
-EBUILD quimup-1.4.0.ebuild 848 BLAKE2B cea8bda4ac4276bf6bd1b48f45304b20eaa2d18a687553628300021dab6a41e550d406bf7c389985d9044893f2b8e2015c7e6acb0afa8c8f0e09cbdf72dea735 SHA512 d45bb1a1a4c0974faadd572b382ba997aaf02d88f0d3febb30bb5623dd9761f49d861a0974a375305f54d65cbcaaa98cb2774860672acea2fa5397da4cda8f8b
-EBUILD quimup-1.4.3.ebuild 797 BLAKE2B 78f5206660a40e18fc2e7ace3abd4ffce8a500470cc96954ffaf07f6f21f75841e1e2c3d2c81c404842f5a51f2a7d13e505cf4d2e2739a258e06f8a0bc4aa6d3 SHA512 5ba2e48f56c8b3a3a3c3d683c26e6a4a8cdaa93457157669a7dbe08434a3f63feb0398cb0689080d65ef9866bcc79d6afab969bf992bd34a95e117a72c8dd7d8
+EBUILD quimup-1.4.3.ebuild 792 BLAKE2B a87e111bc4e8eab3950bf1cce8ae6317bf081d74f4102bfcf7a615990b3d297e39aafaa7bf512f0777c345b30d04bf27f88ff10626e99847b6f1d681e3108d00 SHA512 901c1890a815ecd838b218aea2d55ba939c2dc263bcb52f11e52e2620dbbbc538b8984bb247f025902238d7c6065713708e88aeff7dc69376ea09117cdb8af2b
 MISC metadata.xml 339 BLAKE2B 6bb8fc9b606a6375c7997836909a5396bba8e726e2f0e06820e43574353a83ebe8cfe7fda125c6a1c892eed799195c7b74f1fa5c365686e0335a75f82848bbeb SHA512 02c262de7f82e49ebd91d60aa4e6577b8c4cead1b0b1df8a7bc18b575358e93b17384bc42ace5cf64b13116db9077fbc2262f110f6308cfa3621e994170cebd6
diff --git a/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch b/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch
deleted file mode 100644
index 3f1396fcc704..000000000000
--- a/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/qtlocalpeer.cpp b/src/qtlocalpeer.cpp
-index ddd2c74..52d6e6c 100644
---- a/src/qtlocalpeer.cpp
-+++ b/src/qtlocalpeer.cpp
-@@ -41,6 +41,7 @@
- #include "qtlocalpeer.h"
- #include <QCoreApplication>
- #include <QTime>
-+#include <QDataStream>
- 
- #if defined(Q_OS_WIN)
- #include <QLibrary>
diff --git a/media-sound/quimup/quimup-1.4.0.ebuild b/media-sound/quimup/quimup-1.4.0.ebuild
deleted file mode 100644
index c0bee4f81dfb..000000000000
--- a/media-sound/quimup/quimup-1.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qmake-utils
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="A Qt5 client for the music player daemon (MPD) written in C++"
-HOMEPAGE="http://mpd.wikia.com/wiki/Client:Quimup"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	>=media-libs/libmpdclient-2.3
-	media-libs/taglib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN} ${PV}"
-
-DOCS=( changelog FAQ.txt README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qdatastream.patch
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	default
-	dobin ${PN}
-
-	newicon src/resources/mn_icon.png ${PN}.png
-	make_desktop_entry ${PN} Quimup
-}
diff --git a/media-sound/quimup/quimup-1.4.3.ebuild b/media-sound/quimup/quimup-1.4.3.ebuild
index f1390ac72f02..2c80b78db1c2 100644
--- a/media-sound/quimup/quimup-1.4.3.ebuild
+++ b/media-sound/quimup/quimup-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}_source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index a090ffb7c326..7db9f15dcb0e 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,5 +1,3 @@
-DIST schismtracker-20120105.tar.bz2 1097124 BLAKE2B 978e4b3e81b5c9ed93132aeb12febc2add281060f41d74a52da25799d7ae291d2cbc2401619fd01bc7bba342049d4aef6ac0fbf326443b790c4704301a78a511 SHA512 5b92603af3b6add0e8bd6d0b140b0ddedbaf8e2b434f651ab887e3211ccc8bcfa94be281aabc3b28dbd84e3d91f539eb0939d6d4e0596529133db7ce10aeafd8
 DIST schismtracker-20180810.tar.gz 1064821 BLAKE2B d8016437db7cf6e0087150755090621ba15661753ebcfb8081f0c137a93389d04aa7a5e1ac09fb1366d1d3b3f76c22cb497171a74fb226347eb194c58c1f0f18 SHA512 d131cec7e4749941f0e5806bff14e0782a01f14f8a68605270d09ff40af1d20fffd4c7caf2926c5a63d3e0c0bb1ed24ce4a5e4cccc280ac045a22cfb8544c498
-EBUILD schismtracker-20120105.ebuild 1365 BLAKE2B 8386318c84c7cc74cd744dc8d64ac739e9d109c60626e27400eafce87147c99a7d706a5bfbf5c756ca777f30b3489678764d959380b7f9a5ab577a37460073f7 SHA512 aa012b9e698edfd9a460c80101e573ddc627efeaa2d5a8c65e2bf41600212f0c1dfb44da2f55a57ae7c4e940e187a98c8464ce8092f4de0b1c0bd4cfa827076d
-EBUILD schismtracker-20180810.ebuild 1566 BLAKE2B 790cc5f10cf37da4dd672b0ecd2aa92771898ff8547e912b161e17ed569d9b57f89919dd0af4012ba1c6c520e3748533c6c123b4926ef954784674758eb9ffe4 SHA512 5fac164d9ae0681379f0880d6506a66edb98b7383c0d6d1180247eac5df287d445b1d4895177da60f027868326adbe7c57f60e579ad9617bffcb4929a5a5a3f8
+EBUILD schismtracker-20180810.ebuild 1561 BLAKE2B 1e8699600df0cecc68537ac7d8f55ab8b853ca60c1e50639e7489b35a39e5714947e5e25b41016cf68ca40761128d2865a5d6fa7f6a661bb95cfa48a2726f3d6 SHA512 0cc68fa66cbfeab295863b2637706ef1e6ecdbfa1c438bb3d77f44c58e91eaad24aa6da16a2fcaaa0069c73cbc9c41772aa2fe0adc5b6ebde2877819860f6521
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/schismtracker/schismtracker-20120105.ebuild b/media-sound/schismtracker/schismtracker-20120105.ebuild
deleted file mode 100644
index 14de37e0dfb3..000000000000
--- a/media-sound/schismtracker/schismtracker-20120105.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
-HOMEPAGE="http://eval.sovietrussia.org//wiki/Schism_Tracker"
-SRC_URI="http://${PN}.org/dl/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib
-	>=media-libs/libsdl-1.2[X]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXv
-	x11-libs/libXxf86misc"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	x11-base/xorg-proto"
-
-DOCS="AUTHORS NEWS README TODO"
-
-src_prepare() {
-	default
-
-	# workaround for temporary files (missing directory). Fixes:
-	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
-	# /bin/sh: auto/default-font.c: No such file or directory
-	mkdir auto
-
-	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
-	#   wine provides /usr/bin/windres
-	# and schismtracker fails to use it properly:
-	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
-	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
-}
-
-src_install() {
-	default
-
-	domenu sys/fd.org/*.desktop
-	doicon icons/schism{,-itf}-icon-128.png
-}
diff --git a/media-sound/schismtracker/schismtracker-20180810.ebuild b/media-sound/schismtracker/schismtracker-20180810.ebuild
index 55398fb6ab34..4744ab0d1e18 100644
--- a/media-sound/schismtracker/schismtracker-20180810.ebuild
+++ b/media-sound/schismtracker/schismtracker-20180810.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index e39ca95b0bed..d25785b146f5 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,3 +1,3 @@
 DIST tomahawk-0.9.0_pre20180501.tar.gz 9913223 BLAKE2B 430fedf1a06307721d36ce733dc6f380e56ca4ba018816b4d6cf70370a383945033220bded8fef1aaeb0deb49ec89422c4ade6add997d9034620d42c43ba2b8f SHA512 51ee268a7165ee4968cd3fbd883c8e86fdee049dbf85d11ff3212d1648f08557c868c0c3f0f448c3a7fa6a825af4ee94b498b5027a788b545587bf4bae1be1c7
-EBUILD tomahawk-0.9.0_pre20180501.ebuild 1643 BLAKE2B 5e14d19004d33870fb0351420abd027826a22cb8dc600c6a953bf259785a052de1489abefc761be3b113d9e89c155aa4e9ec5779fcff1e69b9bc9937e17f4d56 SHA512 80b262ff6a7c49bd40f6635934fe39a41157cc290e3e4231b7a05528d59d7b518ef94cb292781137948029b0bbffacaf939d6325261355b831e22f778521066b
-MISC metadata.xml 554 BLAKE2B 162f2f8391a4b5226910cae53834752b14eb003091e7cce4f345f93923a6a09ada4289008efb9e76886f1b7dbd7709f75e010abfb85af71745e06b11394fb9a3 SHA512 25fb52f0a1c11c21f841e68d1485c4e1bcb8194ef16b414f71caa7d378fcea31461f73b0bd064049435d09baf4c90ebb85113f248232c5a933b54f7c971ef017
+EBUILD tomahawk-0.9.0_pre20180501.ebuild 1585 BLAKE2B 35d70ed1b3c8fbe9e96aaa1d3c901a8c41993145142d870577e858970894fce7f9b9cbae5837eff97be334b72975365b02b0c5214e188a7bd96f226e9bfdb086 SHA512 ddbc08c214ab3f17c8dbeea1da2d026f9825257c0020b29089aa0814e2a95f105dac8c29c4aa7d6a8feda5f681f708f4a7f4c93e80534b9f327a9c0469aabed3
+MISC metadata.xml 469 BLAKE2B f1ce874c2e31f6b88d9c91492d08128d7df704724f7db998f1748e2f92c4a02150cbc46eaf9b01c0ebaefc113e30babb34d0759f15d31d5690bf0c65476a54d1 SHA512 1a6df7c09acd55070789d645b4926da6b93095ea9ceea4c593a48140bf86fd0492df908a81350eeaf323478468c7e6814665e0cf6c76dbeb8ba4fddf7efe0986
diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
index a36075aeec6a..3bc448c2a0a9 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="hatchet">Enable support for the synchronisation through Hatchet</flag>
 		<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
index 78600519cd52..3c553a30e8cd 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 LICENSE="GPL-3 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+hatchet telepathy xmpp"
+IUSE="telepathy xmpp"
 
 CDEPEND="
 	$(add_frameworks_dep attica)
@@ -37,7 +37,6 @@ CDEPEND="
 	media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
 	>=net-libs/gnutls-3.2:=
 	x11-libs/libX11
-	hatchet? ( dev-cpp/websocketpp )
 	telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
 	xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
 "
@@ -57,7 +56,7 @@ src_configure() {
 		-DBUILD_TOOLS=OFF
 		-DBUILD_WITH_QT4=OFF
 		-DWITH_KDE4=OFF
-		-DBUILD_HATCHET=$(usex hatchet)
+		-DBUILD_HATCHET=OFF
 		-DWITH_TelepathyQt=$(usex telepathy)
 		-DWITH_Jreen=$(usex xmpp)
 	)
diff --git a/media-sound/wildmidi/Manifest b/media-sound/wildmidi/Manifest
index ff5fcc5e291c..62b087929502 100644
--- a/media-sound/wildmidi/Manifest
+++ b/media-sound/wildmidi/Manifest
@@ -1,12 +1,4 @@
 AUX wildmidi.cfg 4670 BLAKE2B 09b79b3c179a506b6b1b6bb7f5b271926dc6b03daa755fb33c8116adabbf2e592aec32ced336be2986982adc84b78eb811fb417de3b327df8da70f2993124522 SHA512 978d8aeec23430cc0fbd0d625795a63f0876375e168f3be3294553de4d63c0e930775154c8dfa3a925c87010bb83e9e96b9e897de2166f3dbd40c4c14cd3f3c1
-DIST wildmidi-0.2.3.5.tar.gz 375792 BLAKE2B d4f14df0e46ce59d18fc2949d5e3789831301fa86b3abe9d0d027e4beb15cfde871561851d49bcfe3784db16d1a4433a8b3a19a05e673215d84255e0caaa51d5 SHA512 20bce7c551239944d2f6cd27a0963628e13624e651aabfae62380fe953ac3fc67eb27551a427c41ef2b057ec00903128d6afeccfc2688aefd46709d1f941befc
 DIST wildmidi-0.3.13.tar.gz 132407 BLAKE2B 5f603adb7583d47ca0595a48a385412d09ca8b19e99c93ba474d91076fa17a54e12e08bb39ea73d16c07addeab86e6c9d8b778d19045ef6b7d551d041bbc58fa SHA512 e9ede8a98c97e57a7bd34e63fc725a1b47bbff6b41f5dca101249917f0e7756ce4d93a84b8d5b6f592687fd3deed369c22c727873c9bdd1bea6e8c31fdbb4fdb
-DIST wildmidi-0.3.6.tar.gz 105534 BLAKE2B 4c2a62ec61333c3d9dc7f26e981389f22c6b2b611a548d6ff3fa9bc450490ece42f5b1c636dc53fc05c51b445a0ce8bc68fdfccdd440aa82bef36001049ce9d5 SHA512 e7efb9e9e67ee518dd0cdabbe8d701ec3c0762ea007e52533b82f4a4984e0600f7ba1cd9f9b79dda9e553fa04ca861b0b8d4b21ceb35ed0c8f5a4fe6de66d1d0
-DIST wildmidi-0.3.7.tar.gz 121501 BLAKE2B bae856c00449564f9199f977a4881d51c19769da10bf554a8baf681454a50b67b70feeda19592be91beda65131d4f241e661524f9c65163fb95a8570fee7f779 SHA512 b4d40404891161cb55a71dd790e2dbd2c4ec21730c8aaa6f3a68eeacd36d939f859b55ab535bee2feb9ffed04337332ef1eedcffbff6ae02d7499fec97f7a42b
-DIST wildmidi-0.3.8.tar.gz 121690 BLAKE2B fd11315e930a30f89ca57af0819116f8385fa1a7ecaedf7df1decc39774fa0a98df6b12e47bc8254a6c856bf41083571effa3aa70a448c1fdbcc0bbc7e848178 SHA512 883c5b2db84bee85f14a98729496aa9e15f5c1414dbaed6108d07e649b34937cbd3e8a8823a2b6519fcc7fdd354219c0667615c7b31e8952e13f8635e5284f50
-EBUILD wildmidi-0.2.3.5.ebuild 1108 BLAKE2B f1e1c9d2b7f38959cb423ffafd5ca17c6d979fc73e5ef810112aca00dd23a547dbd7e354bb1a86207dea79a42074475e705386b5fa3badf38f2190bcbe063487 SHA512 3937c9b2f532cd09dfcd656b516d396ec0acaeed010ca09ecf8f3609f71b67591e6aae5b009b8810d2f5684040e64de2ca0000b1404666b844dff78888eebb53
 EBUILD wildmidi-0.3.13.ebuild 1853 BLAKE2B a0d488da7321843e051c5c0512efced597420298e86a89bf8e35bf425921e834135ea13f6d7b30d67897a594eb7dfc418bb9d9881f2ff1ddbd247963c8964abc SHA512 357412f782b044b36024adf9a4b77bc1bda16317ccb18746b75c53991d57519450c929baf19a04bba546c97cdb2cc7557c2e34400cc940bba2ec4304487efcd0
-EBUILD wildmidi-0.3.6.ebuild 1870 BLAKE2B a024316067bde1b90b6397c9127238198cccda88dd958fe9063257030dd58d00ad1ae5c6a11dc4cec0d4c7134be7df3fd878efe8f043213f84a574f0fd61ae32 SHA512 a15e48e3141a238c4237b7c080234f24b27dbadbc22b26cdb957939a94dd257f0bc21c6f98030881b3d6a477050c2a77b12c57dfe1a1ff6b0be5944be82c2738
-EBUILD wildmidi-0.3.7.ebuild 1843 BLAKE2B e3637544044e1b73f9c597cdc3a759d3c6e206f8523f7703cb465707446543c728b58dae5910c0049a9216e62701a6feae5cc56044fb98d2d53354d43781479d SHA512 d16c4718fdfeaf13ab6893a8617a9cae136ed2e2639b5649f038b65a588ca0f25b6e1ef247a4572e3cc96130a2eb82c4133956adb425c7266c986136b76f8092
-EBUILD wildmidi-0.3.8.ebuild 1870 BLAKE2B 1930d55817f98a070c49732ac393829e9a6fe628bd7e458d67fba4c04be42318186c9be8b6a034a97a4b1e3b93ec66721a4db0da712f2de4b64801c6a9065adb SHA512 85d8692fc01977a7358a11d88ad05bda7ef90bb378d49d17020599eb5e542d36f5d72b68c7b13f6b1d6c6266fa166d894b2813d3328f6027becd2364f3df6a5a
 MISC metadata.xml 375 BLAKE2B a642a1b0da135ba37ab54d3fb876f980c2a24725e121c4f0504d4d3e49c294cdc7ef9a7cc0b69f98cf72c3cb5a001a242c4eb821bf8f66876ca63bcb471775c2 SHA512 195e8dd23afe8b774740dc438e442981fc640c7191fa3319af3a811a51f840c73d025ff5d8c9377377ad246449be40e0dd9d117d9f1f20beb4bf7286fe6aee7d
diff --git a/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild b/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild
deleted file mode 100644
index 965c76bff307..000000000000
--- a/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit base autotools readme.gentoo
-
-DESCRIPTION="Midi processing library and a midi player using the gus patch set"
-HOMEPAGE="http://wildmidi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86"
-IUSE="alsa debug"
-
-DEPEND="alsa? ( media-libs/alsa-lib )"
-RDEPEND="${DEPEND}
-	media-sound/timidity-freepats"
-
-src_prepare() {
-	DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
-		A default configuration file was placed on /etc/${PN}.cfg.
-		For more information please read the ${PN}.cfg manpage."
-
-	# Workaround for parallel make
-	sed -i -e "/^wildmidi_libs/s:=.*:= libWildMidi.la:" "${S}"/src/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use alsa || echo --with-oss)
-}
-
-src_install() {
-	base_src_install
-	find "${D}" -name '*.la' -exec rm -f {} +
-	insinto /etc
-	doins "${FILESDIR}"/${PN}.cfg
-	readme.gentoo_create_doc
-}
diff --git a/media-sound/wildmidi/wildmidi-0.3.6.ebuild b/media-sound/wildmidi/wildmidi-0.3.6.ebuild
deleted file mode 100644
index a2e39896724d..000000000000
--- a/media-sound/wildmidi/wildmidi-0.3.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils readme.gentoo
-
-DESCRIPTION="Midi processing library and a midi player using the gus patch set"
-HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
-SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+alsa openal oss +player"
-
-DEPEND="player? (
-	alsa? ( media-libs/alsa-lib )
-	openal? ( media-libs/openal )
-	)"
-RDEPEND="${DEPEND}
-	media-sound/timidity-freepats"
-
-REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
-
-DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
-	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
-	For more information please read the ${PN}.cfg manpage."
-
-S="${WORKDIR}"/${PN}-${P}
-
-src_prepare() {
-	# alsa openal oss only make sense if player is enabled. See CMakeLists.txt
-	if ! use player && (use alsa || use openal || use oss); then
-		ewarn
-		ewarn "The 'alsa', 'openal' and 'oss' use flags only make sense if"
-		ewarn "the 'player' use flags is selected and as a result they will be"
-		ewarn "ignored in this build"
-		ewarn
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_want alsa)
-		$(cmake-utils_use_want openal)
-		$(cmake-utils_use_want oss)
-		$(cmake-utils_use_want player)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	find "${D}" -name '*.la' -exec rm -f {} +
-	insinto /etc/${PN}/
-	doins cfg/${PN}.cfg
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/${PN}.cfg ]]; then
-		elog
-		elog "Old /etc/${PN}.cfg detected!"
-		elog "Please migrate your configuration file to"
-		elog "/etc/${PN}/ directory which is now the default"
-		elog "location for the ${PN} configuration file."
-		elog
-	fi
-}
diff --git a/media-sound/wildmidi/wildmidi-0.3.7.ebuild b/media-sound/wildmidi/wildmidi-0.3.7.ebuild
deleted file mode 100644
index f580f035724e..000000000000
--- a/media-sound/wildmidi/wildmidi-0.3.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils readme.gentoo
-
-DESCRIPTION="Midi processing library and a midi player using the gus patch set"
-HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
-SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+alsa openal oss +player"
-
-DEPEND="player? (
-	alsa? ( media-libs/alsa-lib )
-	openal? ( media-libs/openal )
-	)"
-RDEPEND="${DEPEND}
-	media-sound/timidity-freepats"
-
-REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
-
-DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
-	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
-	For more information please read the ${PN}.cfg manpage."
-
-src_prepare() {
-	# alsa openal oss only make sense if player is enabled. See CMakeLists.txt
-	if ! use player && (use alsa || use openal || use oss); then
-		ewarn
-		ewarn "The 'alsa', 'openal' and 'oss' use flags only make sense if"
-		ewarn "the 'player' use flags is selected and as a result they will be"
-		ewarn "ignored in this build"
-		ewarn
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_want alsa)
-		$(cmake-utils_use_want openal)
-		$(cmake-utils_use_want oss)
-		$(cmake-utils_use_want player)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	find "${D}" -name '*.la' -exec rm -f {} +
-	insinto /etc/${PN}/
-	doins cfg/${PN}.cfg
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/${PN}.cfg ]]; then
-		elog
-		elog "Old /etc/${PN}.cfg detected!"
-		elog "Please migrate your configuration file to"
-		elog "/etc/${PN}/ directory which is now the default"
-		elog "location for the ${PN} configuration file."
-		elog
-	fi
-}
diff --git a/media-sound/wildmidi/wildmidi-0.3.8.ebuild b/media-sound/wildmidi/wildmidi-0.3.8.ebuild
deleted file mode 100644
index cf8aa4a65dce..000000000000
--- a/media-sound/wildmidi/wildmidi-0.3.8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils readme.gentoo
-
-DESCRIPTION="Midi processing library and a midi player using the gus patch set"
-HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
-SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+alsa openal oss +player"
-
-DEPEND="player? (
-	alsa? ( media-libs/alsa-lib )
-	openal? ( media-libs/openal )
-	)"
-RDEPEND="${DEPEND}
-	media-sound/timidity-freepats"
-
-REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
-
-DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
-	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
-	For more information please read the ${PN}.cfg manpage."
-
-S="${WORKDIR}"/${PN}-${P}
-
-src_prepare() {
-	# alsa openal oss only make sense if player is enabled. See CMakeLists.txt
-	if ! use player && (use alsa || use openal || use oss); then
-		ewarn
-		ewarn "The 'alsa', 'openal' and 'oss' use flags only make sense if"
-		ewarn "the 'player' use flags is selected and as a result they will be"
-		ewarn "ignored in this build"
-		ewarn
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_want alsa)
-		$(cmake-utils_use_want openal)
-		$(cmake-utils_use_want oss)
-		$(cmake-utils_use_want player)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	find "${D}" -name '*.la' -exec rm -f {} +
-	insinto /etc/${PN}/
-	doins cfg/${PN}.cfg
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/${PN}.cfg ]]; then
-		elog
-		elog "Old /etc/${PN}.cfg detected!"
-		elog "Please migrate your configuration file to"
-		elog "/etc/${PN}/ directory which is now the default"
-		elog "location for the ${PN} configuration file."
-		elog
-	fi
-}
diff --git a/media-sound/yarock/Manifest b/media-sound/yarock/Manifest
new file mode 100644
index 000000000000..c6e7024fdec8
--- /dev/null
+++ b/media-sound/yarock/Manifest
@@ -0,0 +1,5 @@
+AUX yarock-1.3.1-desktop.patch 237 BLAKE2B 3271ee7d08d4a897dcdb51d504653e2472af1db3ba34279d7b101b84c30821a451ccd268ac3d1d7474f1238f3d1bf75ddcd8c9b251558f87ca3333b1591aad8d SHA512 023edebc269b860731a17ff1ae2006b4570848449d9994f61f8d81a1e82779d59fbfb55623fd1855223de74201d3ad4960fbe3a8bc7109c15053f92a29cd0e0d
+AUX yarock-1.3.1-phonon.patch 1259 BLAKE2B 48ee6d115342463015707ad4b79ff2ebb416e36879c365add52c1a6bb0245c8f444c0bb88bd21fa9713d788ef6aeeb2a9a442247fdcc37b92362dfcd142affb7 SHA512 387f88c0f86102fb67fc0914297b5d15f438997f0212d3d9afa19fb00abf2b2aca575493be3f2d7aad42420a1fe6eb092bebcad68e5c195c5875f0f71f9fec1c
+DIST Yarock_1.3.1_Sources.tar.gz 734280 BLAKE2B 3bb8a452a3a7bd27792f67b6fcb2765494738c7a0149248b658333a64f38494880891e8a9d43ef7367d7748e5c0b6a2d9349dc1dd73dd0fecd94d88f21eec020 SHA512 a59837609c5004005360a272b45794143c64373d13c2783f84299ab0b849223aac2be3d87703e1925d66ed4301bcc2e7254228d34f556bce0447d949539acf2e
+EBUILD yarock-1.3.1.ebuild 1056 BLAKE2B 75c7a958102332e39634551cc6bd404c55b4bab67ff4403758381d5868c4f9c638a1a7baae9991647b10ab90420acdbd3dc2c50be4cc0b20749567648806b1a6 SHA512 02bf3138130be288cf16c3a1ef1e73070502b84ef79f73e96d81adaeb752fb642839a4012fc6b55168485167dac987fe37d096e29f47ae1894d393a66e18ad40
+MISC metadata.xml 376 BLAKE2B b3e63f3aed251bf2410912dd48c7933cb85aa4679c3e8dab637d58bff69c018503e68b1e0aabb08734b6101bfa433d4b6a536770537ef077eec4add8f9e1acd8 SHA512 3d21dc4fe86b41b86d253184ae1be5de6c63169b4e0751f22f9733014b5f04895dd09c2ac23bc308ded24fcf61e54e5ab1022307b3a4658187398424a6c3a32a
diff --git a/media-sound/yarock/files/yarock-1.3.1-desktop.patch b/media-sound/yarock/files/yarock-1.3.1-desktop.patch
new file mode 100644
index 000000000000..3131c072dfbb
--- /dev/null
+++ b/media-sound/yarock/files/yarock-1.3.1-desktop.patch
@@ -0,0 +1,8 @@
+--- a/data/yarock.desktop	2017-12-24 08:48:55.000000000 +0100
++++ b/data/yarock.desktop	2018-10-04 18:18:37.700722758 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Version=1.3.0
+ Name=Yarock
+ Comment=Play your music collection
+ TryExec=yarock
diff --git a/media-sound/yarock/files/yarock-1.3.1-phonon.patch b/media-sound/yarock/files/yarock-1.3.1-phonon.patch
new file mode 100644
index 000000000000..53bbf834cbca
--- /dev/null
+++ b/media-sound/yarock/files/yarock-1.3.1-phonon.patch
@@ -0,0 +1,36 @@
+--- a/src/core/player/phonon/engine_phonon.h	2017-11-04 17:06:43.000000000 +0100
++++ b/src/core/player/phonon/engine_phonon.h	2018-10-04 18:23:29.079923850 +0200
+@@ -27,12 +27,12 @@
+ #include <QPixmap>
+ 
+ // Phonon
+-#include <phonon/mediasource.h>
+-#include <phonon/mediaobject.h>
+-#include <phonon/audiooutput.h>
+-#include <phonon/path.h>
+-#include <phonon/effect.h>
+-#include <phonon/volumefadereffect.h>
++#include <phonon4qt5/phonon/mediasource.h>
++#include <phonon4qt5/phonon/mediaobject.h>
++#include <phonon4qt5/phonon/audiooutput.h>
++#include <phonon4qt5/phonon/path.h>
++#include <phonon4qt5/phonon/effect.h>
++#include <phonon4qt5/phonon/volumefadereffect.h>
+ 
+ #include "core/player/engine_base.h"
+ #include "core/mediaitem/mediaitem.h"
+--- a/src/core/player/phonon/engine_phonon.cpp	2017-11-11 07:29:42.000000000 +0100
++++ b/src/core/player/phonon/engine_phonon.cpp	2018-10-04 18:23:29.084923716 +0200
+@@ -29,9 +29,9 @@
+ #include <QtPlugin>
+ 
+ // phonon
+-#include <phonon/backendcapabilities.h>
+-#include <phonon/effect.h>
+-#include <phonon/effectparameter.h>
++#include <phonon4qt5/phonon/backendcapabilities.h>
++#include <phonon4qt5/phonon/effect.h>
++#include <phonon4qt5/phonon/effectparameter.h>
+ 
+ #include <cmath>
+ 
diff --git a/media-sound/yarock/metadata.xml b/media-sound/yarock/metadata.xml
new file mode 100644
index 000000000000..2263346cdc5d
--- /dev/null
+++ b/media-sound/yarock/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>asturm@gentoo.org</email>
+		<name>Andreas Sturmlechner</name>
+	</maintainer>
+	<use>
+		<flag name="phonon">Use <pkg>media-libs/phonon</pkg> backend instead of <pkg>media-video/vlc</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/yarock/yarock-1.3.1.ebuild b/media-sound/yarock/yarock-1.3.1.ebuild
new file mode 100644
index 000000000000..97723a60ef20
--- /dev/null
+++ b/media-sound/yarock/yarock-1.3.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_P="Yarock_${PV}_Sources"
+DESCRIPTION="Qt-based music player"
+HOMEPAGE="https://seb-apps.github.io/yarock/"
+SRC_URI="https://launchpad.net/${PN}/1.x/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="phonon"
+
+RDEPEND="
+	dev-cpp/htmlcxx
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/taglib
+	x11-libs/libX11
+	!phonon? ( media-video/vlc:= )
+	phonon? ( >=media-libs/phonon-4.10.1 )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtx11extras:5
+"
+
+DOCS=( CHANGES.md README.md )
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-desktop.patch"
+	"${FILESDIR}/${P}-phonon.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_QT5=ON
+		-DENABLE_MPV=OFF
+		-DENABLE_PHONON=$(usex phonon ON OFF)
+		-DENABLE_VLC=$(usex phonon OFF ON)
+	)
+
+	cmake-utils_src_configure
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-07 11:03:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-07 11:03:14 +0100
commit	957235cf19a691360c720f7913672adda4258ed0 (patch)
tree	812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /media-sound
parent	62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff)