gentoo resync : 28.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
commit: a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree: 852c90a4bf354c30ea66504f70bfab5401fba18d /media-sound
parent: 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)
43 files changed, 500 insertions, 453 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 3bf95d7d2067..9363ee02945e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 0fd237c97326..a46b82b00a82 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,3 +1,3 @@
 DIST beets-1.4.3.tar.gz 1428494 BLAKE2B 29adc617c4efbb304b05c6bc027a09fd34c11af70b22a86a329fe9048de31828f729114db929e97b103a6f6d8210c0b74716f327f8b4f853f745433fea5f1e14 SHA512 b95a9056abae5da3db7786342e8969b4f9c86c2c4589dd48bad244d28ef3d3da4900d3d3eaee1e45964960c62ecaa8d754a33829e0d7f497f01ecc763c0f492d
-EBUILD beets-1.4.3-r1.ebuild 3038 BLAKE2B a8a3b385c7d22aa27c77729d66a3a525feabda1dbc9b8a9071aa2ab199afa6c5b4b238eb69633c4ef39b8ec786aa28df2feadb1a9108ec2b5a49c5f593dec148 SHA512 0f731ed3addb024699e7a020167bfb5816e11d993aa0d48c37d74c1ed2a587996fbfcce703e78dc5d9bef05eccde5ec2e2ce81bf977f7b72771d30d02803b581
+EBUILD beets-1.4.3-r1.ebuild 3039 BLAKE2B 8bb9b66ba6d8f888fce8c2cf12be4f3f2058b34f5a224b98875b43062f1a472dd3dc3c300d1710bd500e4ff1a830d5517fb7fa66640aa518a444bd79a12c0adb SHA512 57d2023f68f873622b74526840de782953fd2230a0afe2bb874c0a010d137322129af288d42489904b10b277497349fc910a7e4d9994c3f0bfbf2491da47bf9a
 MISC metadata.xml 2577 BLAKE2B dcd49b8888d4e54b9a6ad53f18864773285aeb4d98dd98bba680968d217a474d141d2730126c27f7778a4d984e113445c390a538ceaa7961227289916905aebf SHA512 7a6178f3e0f60ac36bbf2408c2a5b98ddbb3407d2aa6e44317c7b71bba917079bd71b777d837e2921f5eb4dad7cee35a276aab020db610551b5da314810e52a5
diff --git a/media-sound/beets/beets-1.4.3-r1.ebuild b/media-sound/beets/beets-1.4.3-r1.ebuild
index d5491b02393d..20b305abb9c1 100644
--- a/media-sound/beets/beets-1.4.3-r1.ebuild
+++ b/media-sound/beets/beets-1.4.3-r1.ebuild
@@ -11,7 +11,7 @@ MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beets.io/ https://pypi.org/project/beets"
+HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 13c8b330cdfa..2b0fb92f5ad1 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,6 +1,6 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
 AUX cantata-2.2.0-qtsql-5.10.patch 745 BLAKE2B d0c5e3586bb3303983f6d57bacba275e7b0895c56b43ebde69d7664f4bd57f8e1726982389b3da81487918d41085459f6bb2d9bbf2168f5737d7860d6ee68402 SHA512 1622fe94c814544192453d6ee2fa3158cc19d414e37dd76e88724c5056ff290d0070bb251c2f46a83dace906490625b43bcd51ffafa51c65e2dd500c971ea570
 DIST cantata-2.2.0.tar.bz2 2251649 BLAKE2B 9b28a4e3a77245fcf00f81780adecdc51e066f068798f92300ef8527872313f5fb56d4b90a6f5511caf951ba9fcd5c094dd5e9062fe3d314b75412b3e8e03d37 SHA512 519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd
-EBUILD cantata-2.2.0-r1.ebuild 2959 BLAKE2B 995c1d9bd6d66f62bef6838b8f82377e3c869b73bcbb2c499208ced2e5efac5ced285a9a73a064d19f8af354a04d39ea49b7d5f34cff29d7babe4ace52a02bec SHA512 07cacd181b9296cd1cae56e3ee45ff7e5983b463f9c8cd3dfd58854a74f5ce55f83844ba726de07b80ba2dbbd478edbe000871a4b58f6a4f703b5fb1e31b7241
+EBUILD cantata-2.2.0-r2.ebuild 3024 BLAKE2B 869cf24f897fe456aaaa04cad85054f8c0099ba05d068688ed778d5dc898da2c87ea3fbbb88160b809b98a9094b66292c018ab62c1fc84e8fe692d1e56622836 SHA512 5a38a9b09f843edf652e75dde23ccd26fe4555041ceeb111ee27105ef927536971430ef59f07877ab9fb369869531cd7edcb570df61c449d1620b04f1dff20cc
 EBUILD cantata-2.2.0.ebuild 2906 BLAKE2B afc79b29d42719e018485c8742a21bfe596925b2ff83fd8de69bd699bdff03b7dcf8c4a1b0ac69df26fb140b64457485b62ca542c0632b2ec436a064a29b7532 SHA512 62a3a89fe9661db39cc7a8682fd4df72f8fa911a25a4cb1db66cc8f0cd0acdd00912b60a43442832b2dc01df69ab4015e817b345dbe0dc3b71418f52334ee03a
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.2.0-r1.ebuild b/media-sound/cantata/cantata-2.2.0-r2.ebuild
index 9b255bbabbb8..c9cd47b8623e 100644
--- a/media-sound/cantata/cantata-2.2.0-r1.ebuild
+++ b/media-sound/cantata/cantata-2.2.0-r2.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="
 	replaygain? ( taglib )
 "
 
-RDEPEND="
+COMMON_DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -53,7 +53,10 @@ RDEPEND="
 		udisks? ( sys-fs/udisks:2 )
 	)
 "
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl[ithreads]
+"
+DEPEND="${COMMON_DEPEND}
 	dev-qt/qtconcurrent:5
 	dev-qt/linguist-tools:5
 "
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 9e0c715e8d53..49d7e075cc1e 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,8 +1,5 @@
-AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db134710f5aaf62c4e8105ab1b8ab0e69a0953b6177fb91dd89fcdcf5493dfc1e634f51658eea9f050689aa1e219dbd8db189 SHA512 4f520dcd4937634ebf5bb814ec64267d42473886fc5abd4924ac551bbae8ecc7643ddbacd9e2f9a5b0d8c7b0f67cf5aec420b5eb73162b248cbf6b3eafafbbd8
 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
-DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
-DIST clementine-1.3.1_p20180319.tar.gz 8488685 BLAKE2B 2f4c412f9274a8957584bbc2d6482144fd6892adc629cdc0aeb750d592d8e4e62ad5b7bbb56288ecb993a9f5221b54e47e18c3f2b76c7a80670ead37ba5be3b0 SHA512 bbe288ca654ad0ed36abca288187abe452524e8fec23839973ff3f1d61ce479a979cbc45edcba10d6d15ff9baaaa23e95bb7e6d31a0090ca8e32bd547114e1ec
-EBUILD clementine-1.3.1_p20171113-r1.ebuild 4918 BLAKE2B f453ad34fca4f9cc4041183e25f6025064db2449c36a180f65ef89f0ce0582b6bbc10e5719722adb43fac934dcff1eb03680436847a3dba6344d3afb89ae6263 SHA512 ed2cd6966bb13b39cc20675f3f9eca802e3cd97bf20976c7a5d02beac294e1f47d690119238fdf47f4a99689db779eff19269f03cd4282dd4400a1fccab15c99
-EBUILD clementine-1.3.1_p20180319.ebuild 5138 BLAKE2B 10bc35b595622f69037f9b8253542d9c1d25b202c1c02ccd794e73c811325dbdf79d800ec72795b2f3ae404a4a5049fcf489bcaa441ac5c9ff40057d2176ce0f SHA512 27e179e2b49dec67a29cc81a7aa80e7bac3b9f61a30c26de5f824231dac05c8611443cd777d1e2ad8f3c047340f7e16465b7470c2962434a335da51cf6b9f060
+DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76 SHA512 8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62
+EBUILD clementine-1.3.1_p20180416.ebuild 5173 BLAKE2B 719e39db6e88c0a51275b35e8befae30983f11b5eaf1f25e5d2e51508fc4d5cc81b970d7578644a2e4bb1594047f91cb707f5d58be9644f2b0836293575a3fac SHA512 8ada6e4a582f2c8685182c29e322e28d1da7a843d4293adbf032572243eecc226169f1c4e40259de9e478bba4162f3d52c1ed332bba8e720fdecca34e93dbdb5
 EBUILD clementine-9999.ebuild 5108 BLAKE2B e56991da0cbd34bd4b5b574d818445e722f7c0c1f40ae0a0c475c57304e03bf7e7252394664260ab25fc0f7318b708a079b1b373f2824e9a3317356408284c5a SHA512 4a481bd6778f517d52b953d316b7fbdfab5b8d37bdb22763369cc2419150dd6dfa211625fdfb4f89c3736463d4652137884aa4c8f70c904a9215db21b474c8d4
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild b/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild
deleted file mode 100644
index fe90073e56b5..000000000000
--- a/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=83e860eabd9f4a864c553f110742027cdd01b76f
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic gnome2-utils l10n vcs-snapshot virtualx xdg-utils
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
-SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-	wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
-	dev-db/sqlite:=
-	dev-libs/crypto++
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/protobuf:=
-	dev-libs/qjson
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsql:4
-	media-libs/chromaprint:=
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt4]
-	media-libs/taglib[mp4(+)]
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	cdda? ( dev-libs/libcdio:= )
-	dbus? ( dev-qt/qtdbus:4 )
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1[qt4] )
-	moodbar? ( sci-libs/fftw:3.0 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	projectm? (
-		media-libs/glew:=
-		>=media-libs/libprojectm-1.2.0
-	)
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-cpp/gtest-1.8.0
-	dev-libs/boost
-	sys-devel/gettext
-	virtual/pkgconfig
-	box? ( dev-cpp/sparsehash )
-	dropbox? ( dev-cpp/sparsehash )
-	googledrive? ( dev-cpp/sparsehash )
-	pulseaudio? ( media-sound/pulseaudio )
-	seafile? ( dev-cpp/sparsehash )
-	skydrive? ( dev-cpp/sparsehash )
-	test? (
-		dev-qt/qttest:4
-		gnome-base/gsettings-desktop-schemas
-	)
-"
-
-DOCS=( Changelog README.md )
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
-
-src_prepare() {
-	l10n_find_plocales_changes "src/translations" "" ".po"
-
-	cmake-utils_src_prepare
-	# some tests fail or hang
-	sed -i \
-		-e '/add_test_file(translations_test.cpp/d' \
-		tests/CMakeLists.txt || die
-
-	use test || cmake_comment_add_subdirectory tests
-	rm -r 3rdparty/{gmock,google-breakpad,libprojectm,taglib} || die
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# force to find crypto++ see bug #548544
-		-DCRYPTOPP_LIBRARIES="crypto++"
-		-DCRYPTOPP_FOUND=ON
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
-		-DENABLE_DEVICEKIT=OFF
-		-DENABLE_GIO=ON
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DUSE_BUILTIN_TAGLIB=OFF
-		-DUSE_SYSTEM_PROJECTM=ON
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		-DLINGUAS="$(l10n_get_locales)"
-		-DENABLE_BOX="$(usex box)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_DBUS="$(usex dbus)"
-		-DENABLE_DROPBOX="$(usex dropbox)"
-		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBLASTFM="$(usex lastfm)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_VISUALISATIONS="$(usex projectm)"
-		-DENABLE_SEAFILE="$(usex seafile)"
-		-DENABLE_SKYDRIVE="$(usex skydrive)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-	use test && mycmakeargs+=( -DUSE_SYSTEM_GMOCK=ON )
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	virtx emake test
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-	elog "depending on your preferences"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/clementine-1.3.1_p20180319.ebuild b/media-sound/clementine/clementine-1.3.1_p20180416.ebuild
index d1601b410485..0496f8094474 100644
--- a/media-sound/clementine/clementine-1.3.1_p20180319.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20180416.ebuild
@@ -11,11 +11,11 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	GIT_ECLASS="git-r3"
 else
-	COMMIT=804168edc74d7230a84e8937e2ea9a3b1ad2e9c2
+	COMMIT=bd096dcbc3cfa8965ee96245b95c4027278b42a6
 	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} vcs-snapshot
+inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS}
 unset GIT_ECLASS
 
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
@@ -98,6 +98,10 @@ DEPEND="${COMMON_DEPEND}
 	)
 "
 
+RESTRICT="test"
+
+S="${WORKDIR}/${PN^}-${COMMIT}"
+
 DOCS=( Changelog README.md )
 
 PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch )
diff --git a/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
deleted file mode 100644
index 437518695a32..000000000000
--- a/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/clementine-player/Clementine/issues/5297
-
---- a/src/core/database.cpp
-+++ b/src/core/database.cpp
-@@ -265,6 +265,16 @@
-   StaticInit();
- 
-   {
-+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-+    QVariant v = db.driver()->handle();
-+    if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
-+      sqlite3* handle = *static_cast<sqlite3**>(v.data());
-+      if (handle) {
-+        sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
-+      }
-+    }
-+#endif
-+
-     QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db);
-     set_fts_tokenizer.bindValue(":name", "unicode");
-     set_fts_tokenizer.bindValue(
diff --git a/media-sound/coquillo/Manifest b/media-sound/coquillo/Manifest
index 29ec85538bc5..2cf4d2697a3d 100644
--- a/media-sound/coquillo/Manifest
+++ b/media-sound/coquillo/Manifest
@@ -1,5 +1,3 @@
-AUX coquillo-2.0_pre20180303-linking.patch 641 BLAKE2B de62b04bb78b23534462b7a6294d6a9bb3d10ec8c884a5c49bd5ab40eea970a25706266c4be2453788810378731d991ed7ae71203718daf96a78612e39f2c35b SHA512 6fba93765c2b73899eb270b70625dbda96a691a3cfbde89b4d8203b80fe51782513a0bf7c7e428ca0fa402f1246976a22465e1b54a0c40a92d5c2e515cff71c7
-AUX coquillo-2.0_pre20180303-qt-5.11.patch 629 BLAKE2B 5e90214cdb9ba99ec659bfbe43ec6d683146e2e0f297997820be10f432fad10514acac59057e29a32b7f6b5816d9b8db958dcbf66a5dd8dabf362dfbd7fa5ae6 SHA512 4376d227a56630f60056ae153f62314f549bd2c279e4724ac7228606ccc35a6d685ea31eb2a1409d0be5c125220cfdf903b6d5b6d91dff37b6877ab661791fb5
-DIST coquillo-2.0_pre20180303.tar.gz 79757 BLAKE2B 3c1ed5898fae6df940d020a812a8cf63b1dd1301c93264e3318adcff60d975f337623672e862f7c064e7354d47d8f0b6e6760060ae259b2736a775db08152f4d SHA512 8d6a1fed843fa59bc80c3fbdf77301ed9092d641e40511b5f6d89bc75d623cbe8df701e372b77f5aa1d944dd202b2489352655eec36d0fe53a593e4a3ea25ab6
-EBUILD coquillo-2.0_pre20180303.ebuild 889 BLAKE2B 41899f1a83023505d2df8dfe93798a964083c609ec24a63415e83db2fc1dc4dff3f8fec94ce656a9754c62cbe62b9a7b3b1d1c8dce4e447c0a9955487b197601 SHA512 21f66ad2dc53adfd445ae247499bcf5e71b11ff32e8517a66c180d470065176bc09c9e6d30ec0bfb244126016f7650b1ee966a66a3722558e06327c45dff5174
+DIST coquillo-2.0_pre20180422.tar.gz 86061 BLAKE2B 606fa36a91e22ffc618fafb9fc8fa15d13403eb3acbec2ea64296709ddaea26861be872bb8f401a8eff3385b058b8dc4d391faa08d0334630e831185df0b9612 SHA512 2abedb24debcb05cdfb17bae535f7b8f8d2e897e2200d1d802757fe4a53e616fa3a7fc2a2222c1c1e3cf385416e44514fa129c7c880568b3c616f3afe2b3f069
+EBUILD coquillo-2.0_pre20180422.ebuild 825 BLAKE2B 4cc8ca6126ebfa779198108f1e91fd655d965ab689e03a29e359c47adbd2eb71d63b18f4c28b7709aceecedff53b2e4dc20c366ecf877e0bae11fdf153589b99 SHA512 d46bbb0c02179893c1dd328699bad65886f01e9a8088309e01c818e97000b5d39c782cd2e8e1a4d08f7cdd5a4ee8b1ceb132da7e25e0cb43ec033c4e2dfcadd9
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/coquillo/coquillo-2.0_pre20180303.ebuild b/media-sound/coquillo/coquillo-2.0_pre20180422.ebuild
index 4ffd1266f3e7..6eb3618c703c 100644
--- a/media-sound/coquillo/coquillo-2.0_pre20180303.ebuild
+++ b/media-sound/coquillo/coquillo-2.0_pre20180422.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-COMMIT=dc8f1c6751242d6c0416472fd91d972d110be67a
+COMMIT=05e97cb24d0d296d3becea9854fcb0562302ab4a
 inherit desktop qmake-utils
 
 DESCRIPTION="GUI audio tagger based on Qt and taglib"
@@ -29,17 +29,13 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-linking.patch"
-	"${FILESDIR}/${P}-qt-5.11.patch"
-)
-
 src_configure() {
 	eqmake5
 }
 
 src_install() {
 	dobin ${PN}
-	make_desktop_entry ${PN} Coquillo
+	doicon extra/${PN}.png
+	domenu extra/${PN}.desktop
 	einstalldocs
 }
diff --git a/media-sound/coquillo/files/coquillo-2.0_pre20180303-linking.patch b/media-sound/coquillo/files/coquillo-2.0_pre20180303-linking.patch
deleted file mode 100644
index e781535a4300..000000000000
--- a/media-sound/coquillo/files/coquillo-2.0_pre20180303-linking.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 16bdcf9f0ab24b7d57b7e065534b87810beff63d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 10 Apr 2018 10:21:29 +0200
-Subject: [PATCH] Fix musicbrainz linking
-
----
- coquillo.pro | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/coquillo.pro b/coquillo.pro
-index 63b1cd1..5bbe6a2 100644
---- a/coquillo.pro
-+++ b/coquillo.pro
-@@ -16,13 +16,7 @@ RCC_DIR = build
- unix {
-   LIBS += -ltag
- 
--  exists(/etc/arch-release) {
--    LIBS += -lmusicbrainz5
--  }
--
--  exists(/etc/debian_version) {
--    LIBS += -lmusicbrainz5cc
--  }
-+  LIBS += -lmusicbrainz5
- }
- 
- 
--- 
-2.17.0
-
diff --git a/media-sound/coquillo/files/coquillo-2.0_pre20180303-qt-5.11.patch b/media-sound/coquillo/files/coquillo-2.0_pre20180303-qt-5.11.patch
deleted file mode 100644
index ba2c02a7821c..000000000000
--- a/media-sound/coquillo/files/coquillo-2.0_pre20180303-qt-5.11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 03a1b15c2c364368d801da4ebe89ae1083d68b4d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 10 Apr 2018 10:15:33 +0200
-Subject: [PATCH] Fix build with Qt 5.11
-
----
- src/processor/parserwidget.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/processor/parserwidget.cpp b/src/processor/parserwidget.cpp
-index 10320e2..94d60c3 100644
---- a/src/processor/parserwidget.cpp
-+++ b/src/processor/parserwidget.cpp
-@@ -1,6 +1,7 @@
- 
- #include <QDebug>
- #include <QDir>
-+#include <QItemSelectionModel>
- 
- #include "tags/tagdataroles.hpp"
- #include "parserwidget.hpp"
--- 
-2.17.0
-
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index f6df70aea751..aba2293d1f9e 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -2,8 +2,10 @@ DIST grip-3.4.3.tar.gz 740870 BLAKE2B d6b703d4ba08bf976a53e70772977a6b0fd5cd231f
 DIST grip-3.5.2.tar.gz 952153 BLAKE2B e82ccb50636e68ab9862d2004a4dbe59399372b76a835b33350e539a186fed516e7b4961fe930b3beb5168554324a5bebeee5ef03d1cb7731d7f9d7c1fd1feb9 SHA512 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421
 DIST grip-3.6.3.tar.gz 960255 BLAKE2B 9aad33c04e98f60e5f7871e36f2e4bf616a16486482e7363d165ae7d9fc5343a52583e490b9b9757d31b051e6e96165d35931370e2681d727db7abb0854db2d5 SHA512 f94c5dc24a1355a024833992d05a7c05d84367a004607c9d6c7aa6d4bc24dd93b11e0a061689eb521a8abe637472011a1a4c8e968c48ac8447457cffc4d2957d
 DIST grip-3.7.0.tar.gz 961006 BLAKE2B 826656477ae4d26aa5d3a43cd08336a20144adf2cc0ad538afb288daea748c94b453f5752e4ace95888294e5d269b20ecfa6fd66d4e4b3316af00140d0d25b4d SHA512 bc2cbfbc1602a3639944009326e485195dbbab83a3ee15ab7291050ccc8b62dc52e052dca50a040335cfb20ff8d244c5315a15e8d940f6a9d89b2808d7876ca1
+DIST grip-3.7.1.tar.gz 961428 BLAKE2B 0c31b549577a1bbde17936e8e243d6fa573c6ac0c6035ea303c983c6ac26a0f7ddef193cea74a4148655f2305db97b3e74476bfe763fcbe77c656e012b4fe07a SHA512 812c6d0715e18da78b8657722697cf7b39b345f2d94c5a3002c6a512ff0482d4e96b58910e0c2fd459ac707a24754c6c491e66eac7692c49ec69bb869079202c
 EBUILD grip-3.4.3.ebuild 1207 BLAKE2B 014b3ae549e72ae4960820532e746337a3d821684f98e19619ab9314441c2be743df3e7049885c921bd5d09f837d275a661116a9c258cfce1008f7978a5fcb00 SHA512 e6fff5d8728217b346a200ee84bec062212be2a2b37e5e942f730d897e53983df66e032a72e7540be6aa83732cd9bd0bdf20566b66ebf6a37a21f1e909a6f44c
 EBUILD grip-3.5.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
 EBUILD grip-3.6.3.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 EBUILD grip-3.7.0.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
+EBUILD grip-3.7.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.7.1.ebuild b/media-sound/grip/grip-3.7.1.ebuild
new file mode 100644
index 000000000000..b664cc4ecb4e
--- /dev/null
+++ b/media-sound/grip/grip-3.7.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs libtool
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="https://sourceforge.net/projects/grip/"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="vorbis"
+
+# lame and vorbis-tools are no real RDEPENDs. But without them
+# grip cannot convert ripped files to any format. So use them as
+# a sane default.
+RDEPEND="
+	gnome-base/libgnome
+	>=gnome-base/libgnomeui-2.2.0
+	>=media-libs/id3lib-3.8.3
+	media-sound/cdparanoia
+	media-sound/lame
+	net-misc/curl
+	>=x11-libs/gtk+-2.2:2
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/vte:0
+	vorbis? ( media-sound/vorbis-tools )
+"
+# gnome-extra/yelp, see bug 416843
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
+}
+
+src_configure() {
+	# Bug #69536
+	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
+
+	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
+
+	econf
+}
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 1011c861dba0..44ccd738b076 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -2,6 +2,8 @@ AUX kid3-3.3.2-libdir.patch 1506 BLAKE2B 1265271633d61cab6d4ebb49284645a1528dedd
 AUX kid3-3.4.4-deps.patch 1485 BLAKE2B a2c4b9ac6e956dcc2e6415b502e0ca34814d668ceb3e2e315f4da8da382041cf55f6b5531d298ecc00ee242433c09d2095e4357a9814fd9eda60d501672c5a74 SHA512 af386071836e542e178cda38297091817943a3f754e4d14b3cca2ec628bd7c13980932e77b1f9e3c578b095d88ea2b24e89e58b6f726c6f656989fc08bc8a808
 DIST kid3-3.5.1.tar.gz 1414829 BLAKE2B 42d172a443223979e6afbda3f6dec240a5bde22f102fdd4d6d64f3cbe30dc80a4cb09ed0d28176122801211e311441997ae162025ff0460eb803fc3ed1aec34e SHA512 7f1fbd6d1d576d23f9b57baaaa35101fb2e9ea23dec5b5506e25ec5a94dc8516d25b69b4dddb4a9b4835b2502d0a07087c245380483571a68e5972f98ca8ca58
 DIST kid3-3.6.0.tar.gz 1425297 BLAKE2B ff1c8dd8aed2b24c27c458e2215e304587bf658495ad8c8f7ceecd6f9960b010600c25be4ca0c512cf4c5335d48fea7b6267baae0ce2eef2db4dc271442f128c SHA512 ceba8175260d2ef6fad441c7ee5c9b2870b85988515229c09acfccd1a108998b07040dde26ca426de466599b9171fac37f001237991ae977f59742bbbb0cd4f0
+DIST kid3-3.6.1.tar.gz 1428799 BLAKE2B 055743c06bf28188c16e627556e1c23cb724f6a1601975f259a912445063a23f3c6d8101cbb3f582fac66c56bbcbaf243e637132b20930f718f2c5b1056b7dc9 SHA512 026be02c3dea1f05af0f24a26ee9d6b775f7e408db6de8afbb3dda5f66ee465263fb1c3763d4e8ab52b1856a58c1ea21228d24cdb754508e68c04f7d5cccfb77
 EBUILD kid3-3.5.1.ebuild 2012 BLAKE2B 66fb419abe7ee271b8b7ab60bf53ad8937e262abbb43621c7f9b556434e15cb90f0b43f08fe3de407880a132c546b456083a4d6d47d54a837a2f3ab6656f04a7 SHA512 031081877a9fe56f881f75ec28ca65a8301a9b5c4d9abd7596a0a547ad39eeaab8b6ad99485d2b44dd65dac24395b8f6f95b04becf555ed251099ed2d358c51a
 EBUILD kid3-3.6.0.ebuild 2014 BLAKE2B a955dea1b861316afdf42b3936da65d875baf24165640b9e8f9958fca12788bdc68fb190116f90baf462b3d595de1b62ff7b63a5be9020a488a532f14683068b SHA512 acab344e781bc386e84d9e3dafe518b6b7982b243511ee6c6c28645076b5c4b65c53aac9fb737b3953ee7a7c0c8d2440a0b00254fdd9b94da80c582f47aadfad
+EBUILD kid3-3.6.1.ebuild 2014 BLAKE2B a955dea1b861316afdf42b3936da65d875baf24165640b9e8f9958fca12788bdc68fb190116f90baf462b3d595de1b62ff7b63a5be9020a488a532f14683068b SHA512 acab344e781bc386e84d9e3dafe518b6b7982b243511ee6c6c28645076b5c4b65c53aac9fb737b3953ee7a7c0c8d2440a0b00254fdd9b94da80c582f47aadfad
 MISC metadata.xml 672 BLAKE2B 380133bb3cfd6862da40dc672da4c513a53a81adf40ee0552ae6df65afb42979a19e32f0e72d909f15d78f014e19057e0b2db69e087aa6bb222f7d4b7ccde88d SHA512 b76d1d9b77eab5a42ebb2bae4a039a0a9abc5227e37fbe3066ca04aacfaebfdbcd99b3901eba79bb8ee46a64fa58a3aaf6370eeb3706d1773e137b02de1202ed
diff --git a/media-sound/kid3/kid3-3.6.1.ebuild b/media-sound/kid3/kid3-3.6.1.ebuild
new file mode 100644
index 000000000000..17db2bbd586f
--- /dev/null
+++ b/media-sound/kid3/kid3-3.6.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
+inherit kde5
+
+DESCRIPTION="Simple tag editor based on Qt"
+HOMEPAGE="https://kid3.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+COMMON_DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtmultimedia)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	sys-libs/readline:0=
+	acoustid? (
+		media-libs/chromaprint
+		virtual/ffmpeg
+	)
+	flac? (
+		media-libs/flac[cxx]
+		media-libs/libvorbis
+	)
+	kde? (
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kcoreaddons)
+		$(add_frameworks_dep kwidgetsaddons)
+		$(add_frameworks_dep kxmlgui)
+	)
+	mp3? ( media-libs/id3lib )
+	mp4? ( media-libs/libmp4v2:0 )
+	taglib? ( >=media-libs/taglib-1.9.1 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!media-sound/kid3:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep linguist-tools)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.2-libdir.patch"
+	"${FILESDIR}/${PN}-3.4.4-deps.patch"
+)
+
+src_prepare() {
+	# overengineered upstream build system
+	# kde5 eclass src_prepare leads to compile failure
+
+	# only enable handbook when required
+	if ! use_if_iuse handbook ; then
+		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_PHONON=OFF
+		-DWITH_QT4=OFF
+		-DWITH_QT5=ON
+		-DWITH_CHROMAPRINT=$(usex acoustid)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_ID3LIB=$(usex mp3)
+		-DWITH_MP4V2=$(usex mp4)
+		-DWITH_TAGLIB=$(usex taglib)
+		-DWITH_VORBIS=$(usex vorbis)
+	)
+
+	if use kde ; then
+		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+	else
+		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+	fi
+
+	kde5_src_configure
+}
diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest
index 8e87f26a9f3e..ebc4f42c8f40 100644
--- a/media-sound/mp3gain/Manifest
+++ b/media-sound/mp3gain/Manifest
@@ -1,4 +1,4 @@
 AUX mp3gain-1.6.1-CVE-2017-12911.patch 2804 BLAKE2B 71d410abe4196cb47d4f006af7d8fd73a0308280ce57aaa955434c9f7b1bb8bf3363eb1ad8dbe0da3b5dd79e4ac5a355b796cdc253608c5bf2ba7c03527c3b32 SHA512 b5b093f18160cd4205870952d8f092c300f66d6fa025ac09114f55b1e5b37af6ab8ea1b505e33446f6c7153a5ffad04c001b67f9a069db8d3418c6fae3e73002
 DIST mp3gain-1_6_1-src.zip 68932 BLAKE2B 8c1ed35123f1613e189ec7bd74ee9f6176404a1b79c660f8f1a6df461cdfd3c6bb505daa09b8cc4756e1755d0923fe473a45c3ae171fcf35df22daaa08a7717a SHA512 6d26a7716a1901c80caff9d7fb03a454a452c06c6a57a7a921d5979727e112ba139690d8a287dde7a6e5a09b022d3c6f57193b4756a9c25caa177cef65f9e375
-EBUILD mp3gain-1.6.1.ebuild 676 BLAKE2B ecf7bddf2ac065af612287123bb04fde4adbf04221c4dc409a59f22213ed1c6ee04dd1e8e0b8922d3f465a90f3ed34f312b5acb8329efa332215dd79e9b9cc22 SHA512 52fe2d39c153bfa0d83ac36fb89f3a694b881850c3c69bfbd6f1af6599abb6fd665bc9d94effb25146859d297a32580a4841442a10d37e5a594bd06666e777c6
+EBUILD mp3gain-1.6.1.ebuild 674 BLAKE2B 1c387f1c09c730edc6fc1cee1839afab6b7442c6438a18ffbdbbaaa0e8899f5f066152b09aed28f548062c1fee226e63a253dca0946974c7f5d6ada099274fc7 SHA512 f910267f3a4c42215714fa5371b0e475ddfcd0b84a6ff319037b840f0068c91f6ee76dff2a43d685c0210eff0105569c7f0a6d80fdf2d41c68596c581c931507
 MISC metadata.xml 452 BLAKE2B c0b22d81f8e91934b834281f256b67e4e61a86fe9cfee08ace713baa8ff28221393594e9199aa631889c2b7e25b50bc108876b3f991ea7bef7575e486d5b206a SHA512 8ab00c2369fea3ed2ae75f5d04939ac81f4f227236215556157c3616ce1d72636c94af0988f06c995a08dd95c3774635c5d954e6992a077c20c7472be907a119
diff --git a/media-sound/mp3gain/mp3gain-1.6.1.ebuild b/media-sound/mp3gain/mp3gain-1.6.1.ebuild
index 87dce052e2ae..8999596cf533 100644
--- a/media-sound/mp3gain/mp3gain-1.6.1.ebuild
+++ b/media-sound/mp3gain/mp3gain-1.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/mps-youtube/Manifest b/media-sound/mps-youtube/Manifest
index edc9430da367..1d035c22e38d 100644
--- a/media-sound/mps-youtube/Manifest
+++ b/media-sound/mps-youtube/Manifest
@@ -1,6 +1,6 @@
 DIST mps-youtube-0.2.7.1.tar.gz 78128 BLAKE2B 1883ac93ec06b657f72463291d4844b4cf5c1edfb14088769d32bb7590ea676c06a1022724c40b94230ee5469864b402a07c56e535ac3001d57c87cf6937d370 SHA512 760bd6ef6c04606e6e70e4d7f985482c5d5f1f33481a69398d20c2518ae7a1b0371501e31b6d0bcb46e702c53d8b2311e4556700c7d2ae4011006ffe9582de9b
 DIST mps-youtube-0.2.8.tar.gz 95542 BLAKE2B 67aa7db4e26325ef35b6c263ad1020bfc76ee683314c4e49b5f850d9c49c3795b5e9f3ee042772d9ce1c682fd04cd21ac24975cb3b7b7a2c4834bbd51b0726cb SHA512 7d4e092225652b5b63a2f94e7fa7cf07ff8f7797bc412de9388883ca9f95e87a14ff59276f28d208c5fd2e74315b1d7f275937f7c4cc86134ae5778d880d2620
-EBUILD mps-youtube-0.2.7.1.ebuild 591 BLAKE2B 0c23f71d2cb64dd2f40d133948def4262f8f105eee1b40d9f2abcddb33a4b655fa6bf403bb2d77a13df51db4aeca0a8470674a1cb2a9e507fcf5773e75aa21eb SHA512 d12ef8d8cd26a280d7bb3b611f5657bd26347d1cf8a8329f266fba097aa141f9946632d6c781bfc477d91869a2701953d6f6d03227d08d0d9abd11ee71d3ed17
-EBUILD mps-youtube-0.2.8.ebuild 714 BLAKE2B 0ca8c38c08a7b0a80cfe5714703481400e9e0baca220e3b5d6eda9a37dfb505b642174edfe5f550f1fc5ef508cb9769e8933518f9ee5820f21d9147a5ca0a303 SHA512 a00a6e0286e16d22bb05a38b796fc2a16df4a7e5fcd3cd8b8ae689aae1abfc3363f458e724d26f9d3bb7c9be9b3d9d4385a70fb80c2242a7b3173327b5a170bf
-EBUILD mps-youtube-9999.ebuild 714 BLAKE2B c47bff55d839ae0a35a63995a89978662d90879e0f3014c2ed4fc5cd799d17f88d2812bf183cc721e9605ad85ccdd89df3c1f74545837016454ce16a3545a73d SHA512 2bcb0b3f4119158b006b326f664673dc3fc850f71f518ac783bf7b68609c6b192ceee8945a5c27aa070224c1812d576709fc85f951601f0f390c8f4e9250a553
+EBUILD mps-youtube-0.2.7.1.ebuild 592 BLAKE2B 7224e3b48b3725c3a79f3487c408ab863bd5cac6b34aa53520b2b22d23d361c9435577d9dccc6d2928d91e8045e05d9a39bbfcb58413190ff22cb9dd1c6848a2 SHA512 713410c6f919aa27033190a1616b624bf62660e93dd579b4a7df0080db668363c3ef737aaada6b87aaa3debeb181517ee300e97f674fb155a1432182e8fa682c
+EBUILD mps-youtube-0.2.8.ebuild 715 BLAKE2B 1c7f6b8fd2000ea93b397936ba2b08933f6219b0fc25a42c52285352d423bb6a2fb0a7a5367c4f98dbd0fe9e4d3d1fecd0ae21364da0b39e9c1f76dcc7f4cb81 SHA512 b71975b8d4b40f7181dd88cf660c51d7273ad925af391d7b532ca013aaac9f93aec066a5fd5774af7fecd61f82fe523a332590b3493e769d172ddaf0930f09c2
+EBUILD mps-youtube-9999.ebuild 715 BLAKE2B 6db89a4d3a34d91fe7b191ed3d4faa41557bad51891de00cc70641da2e9a7f19c2355e76f6ee0cae0bc8ed98ca5aea0dfa6b1c9dbc2b4b103ef9fa5f5842e4fe SHA512 c3ae59308f9f3d05b9a95aa14b35387460d3b1099140252b21d1ee7693da14f7f924e3320661535d86d1f3f43787e7186ebff549e16fc9a45d989ec783374b73
 MISC metadata.xml 390 BLAKE2B a451cde37ad9b1809005675d0dc8233c760f0ee1678474d60c74990a4ef07da572947498a0da14577072a4f14e57da7b008251ff551f4bcb9ee966957344bf83 SHA512 22e8eee2d28b36f19350ef791ff5a5d705da83b4dafb9b0e959b5cfe4ea6cb5f4e4a47c29eda531e189a253f7d26d58f1be127896cfc2d4fa08bd4e142c61e70
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
index ad159c9c7952..d4a5c32c82b4 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
index c08548b41d71..2bc7de936ab4 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube/"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-sound/mps-youtube/mps-youtube-9999.ebuild b/media-sound/mps-youtube/mps-youtube-9999.ebuild
index 85dbd24601ff..196606cc1844 100644
--- a/media-sound/mps-youtube/mps-youtube-9999.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-9999.ebuild
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube/"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 673d56eab88f..f0cdfc6d9ca9 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,5 +1,5 @@
 AUX mumble-1.2.4-speech-dispatcher.patch 1289 BLAKE2B 674312376997a2ee7f70886f8a7ec13731f46bc25870c1af239d6814ef66192999f89d644caf63eb98a3ad4fa3460c16fbfb2acb35c845c181cf08943d142c3b SHA512 32b83ba846fbda3529c222df2cf6fa0f615dabdd7e211051119fb9ed53bdc3e8e11aaa1b132bbdfcedffd72b1e19666aaf083799f7ebbbf60f536a9f9a0c6a2a
 DIST mumble-1.2.19.tar.gz 3210865 BLAKE2B 7ce466ab9d5ca761308d08633abf8efb6105b3097b7fde0a886f957dff4a16442d1f12c93123bd0291b37d14b412e0087b89f781d0f63a5182bd6ca2d3f2d3fe SHA512 f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4
-EBUILD mumble-1.2.19.ebuild 3095 BLAKE2B 2c2e2584dafe44c878c62a9515c329b97c151135726fa519e488ed8aaff987262fc9acd1252538b1f4600943c68ce1fdc79622769ee859c0028fa2b4872b9b27 SHA512 0353785b6799d7adb7a1bf161232ab44e5b3dda33fdb74ac83296839d0613ff4960c5653661594fd6cf8434b262f93c391ee945dc79d327916aa334871987231
-EBUILD mumble-9999.ebuild 2924 BLAKE2B 48424961674b06e94e789a7400381a35ec3efadd5c76d0cff19b716c9c772d7ab95a71cd51ef6a918e472bff07ce96b5a1f06f99dd161c9593767cb94454d014 SHA512 709f0e96b09e74999f6243d5cdebee966744769131b578062bb4e44bf413c738990e37e82fba2118dd931c6d5a1b0143a15c2ae521420f32497d78e2b29d1368
+EBUILD mumble-1.2.19.ebuild 3095 BLAKE2B a5e66a778fcd3501b02ba720d1ae9110d7c5bda37a765426bdff8013051f0d94f33748620d0e8efbe6520677d6370a2bd8e83084b36817b29bc0ffc11b3161dc SHA512 e9a8235c11426026d8664d4671b0286e658fa2415d67c34cc9a381cb810feb09bd179495735d655331959f96c173079c7d0196d4638a8b4364f4ceeb2c841956
+EBUILD mumble-9999.ebuild 2923 BLAKE2B 8427b80549010836baad3e8a102821558eccb98ed005a9fbe7cc3dbee6289ca829e4fd5a909b99a5fd4e592ef00faf6cf7e956c92e253e4018cc1bb786c1e827 SHA512 4a6bb8e9f5d10e564bc46bb6a0099cdb4dbe112e3d58a20c97ba2132af0bb6a6ec280bd276552edb2c4678f190f0c0f2a076c34e5b3fcaa04acef9f828220dba
 MISC metadata.xml 751 BLAKE2B 17b72569ef8313fa654bd444572521c482b1b2c4d14bc73b41be5f6ddf8e9c8e9064fa1a87b4589f7a18a5ceae835fb60718226059f5b96d4dfa6e2b26256630 SHA512 78d4d18e60dfbcbab8b1ae64f214c2f6aa0ae7ea01323590f3847b1ed50fc90a29acbb5a44c65e82747237e60d5d4a24c9b2808d4e4a90a996ab90952340c18b
diff --git a/media-sound/mumble/mumble-1.2.19.ebuild b/media-sound/mumble/mumble-1.2.19.ebuild
index a57aa61a3a66..084e6e7205ca 100644
--- a/media-sound/mumble/mumble-1.2.19.ebuild
+++ b/media-sound/mumble/mumble-1.2.19.ebuild
@@ -38,7 +38,6 @@ RDEPEND=">=dev-libs/boost-1.41.0
 	dev-qt/qtsql:4[sqlite]
 	dev-qt/qtsvg:4
 	dev-qt/qtxmlpatterns:4
-	x11-proto/inputproto
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( dev-qt/qtdbus:4 )
 	g15? ( app-misc/g15daemon )
@@ -47,7 +46,9 @@ RDEPEND=">=dev-libs/boost-1.41.0
 	speech? ( app-accessibility/speech-dispatcher )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index c7799fea4f9a..e4b464c16525 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -56,7 +56,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.41.0
 	virtual/pkgconfig
-	x11-proto/inputproto
+	x11-base/xorg-proto
 "
 
 src_configure() {
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 21933c6f85c2..0460345b9e22 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,8 +1,10 @@
 DIST qmmp-1.1.12.tar.bz2 1147871 BLAKE2B e511b02c38cbc5fcb478585df14a50c9f67985da9ef5e1e11557f2acbbd454d1b1beb430c8e2e2725a7d9ceea63243746fd41ecf2970fd3c52bcf21857bc1228 SHA512 a45680dcee478a7f03a04dbc87525368ac227a9de7e803252470f517027639d3426bf27a3235996d94ad68212596c03e7a67b5ad00a642532f02a820bf4097ee
 DIST qmmp-1.1.7.tar.bz2 1135005 BLAKE2B fc6574b5baa1aaf89cb13f194e59daafa0fe502c1e5ebe5322ae5564eeeb590b6f531307470dc93ef586d992ac827c114b89559ba83b6daab57d16e364388c53 SHA512 058187d34b848c0917077a167bcb52c63e39b5150409295ea658484d99fcd5582f7871979d3d3eea40aa97f0d9bf2a2d72ae721b827bcc0366b1bbc652aa3a72
 DIST qmmp-1.2.0.tar.bz2 1182024 BLAKE2B 0dc471b053a68ddd1f4e5e09d37776712a7c3f323f801920e34843df54a188c9bc5edfeade5791be67177bb9b7a9435ab41763b156d068522db654d9c5a51809 SHA512 63b3a499efa1886d2bb0da093ab5b495a147a0d9ad23780780fd85011ae571179d71dc4222efab39609fe59ec25b9b62d907c8d10decd7fddb73220d963dcf57
+DIST qmmp-1.2.1.tar.bz2 1187267 BLAKE2B 11577481801c9a89acd327c23c94bbfee8e1d3869da6f271f6fa392623977dea256e3a521493f1de5255ac57bc7b881cd0a47b2bfeb5f516d1a5238dd6ac6912 SHA512 a21483e075934b4f696384737cc852c5054f2b088430db84cd461f6c16d6018ea02c992ae50467093f30c82d671113a4c308040d91328ce941e14fabaeb93e17
 EBUILD qmmp-1.1.12.ebuild 3860 BLAKE2B 3ff315969c52877dfd02651bee97b01ba72ab00383a20f6183ad823e0242b3d4676bcc3d28c6a4c33c1c4a64810757f09d1add8b14d656354ddc81ae88ed19a3 SHA512 cb3b6e484f7f63f6659937362ad090a0534c759f4bcdffe9b8aa1161d1a3733bf3dc2b781bbe8650fdeba88d1b52a1f3db7fe0da0206c9137f161dc7bd99ff1f
 EBUILD qmmp-1.1.7-r1.ebuild 3858 BLAKE2B 544e062718ea06fb28e0920ef7d4c1ee1fa8ad850248a956df78054f1f63b06538af04cd8b09fb5f059af5748ce2530f8fb72dc33f902b1c6b5cfab9c8d62c28 SHA512 88a97842bd3b8f43409c420d391421845a45ce597e9334a6218b13bd36ce18dcc510f82dbe67f175e88ed8da5c8bb28eb3a526c0499f828041fadc9b6c3ba22a
 EBUILD qmmp-1.2.0.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
+EBUILD qmmp-1.2.1.ebuild 4174 BLAKE2B f89ba88df7ddcca820028778416ece543951481e82bd6136a45e95349f934e2a3683e2c5dc5248c606c51e44d2eae4c1ef5686e8eec8a93ba1b2fd2ea958a538 SHA512 b33fbca7a5e380f08adcb182caf3772b30e3bdb092e88684e16b8298646b89fae14cb9ebbaf3f1292c2e44689863515d4f87bc944ff5e1f37ff1abd314a8bb49
 EBUILD qmmp-9999.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
 MISC metadata.xml 1888 BLAKE2B 32fdf16e8d12c830b72d46d887c9573f583c83c69a405ebb32bb9ac6b46f2100fd29b78241e0982df54fac2b2f7f9ee0e53f56d5f06e388f177514a427ad10ad SHA512 8d17a27caa187aca78e9fbbd64a6226a4055232a39f68e8b211ec8d4062343885e2c4efd47a551e157fbb1cb674cefb3be26c645223e68a57e0b75e4b3a40fe0
diff --git a/media-sound/qmmp/qmmp-1.2.1.ebuild b/media-sound/qmmp/qmmp-1.2.1.ebuild
new file mode 100644
index 000000000000..b0b24f039928
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.2.1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.2"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
+gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
index 65daed0ead21..22f734fe173f 100644
--- a/media-sound/qtscrobbler/Manifest
+++ b/media-sound/qtscrobbler/Manifest
@@ -1,8 +1,4 @@
-AUX qtscrobbler-0.10-Makefile.patch 1359 BLAKE2B d5470ce7341b1765e345b13f97056f13bc556498e9b748b2b1a9f847c900c84680f570588bb5c1b6600195c45deae01d85d93bc98ab51fddbfa222e88bd43668 SHA512 13c6256dc3121fad8b52e479a4700c807229dd8b29f4d8f79492df9e1c2e06e9d28ab50cbccc73a706f2ec3cbd9be7ffc2274bc015862afa4ea1297a73a6d004
-AUX qtscrobbler-0.10-free.patch 623 BLAKE2B 0ae65ab0d6ae115b34cdfeffbe634269896e11e91e92155c627fda0f88dbb630255f67087949c3fe825ee5ccbd472ce701fa856b2648e8b044f26879634ba346 SHA512 42d4093e033883fd2dda4313a2c731d418fbbf6ae70a2d79003622f917791560eedf9ea185029bca25416b34ac51bbc1b7e78bb597a33d89b92e6abab89f4226
 AUX qtscrobbler-0.11_pre20130123-qt5.patch 5444 BLAKE2B 5e8ef860627e3f8a1b5c6d7a845d4b71c2ae473a42c1fd9619d9a6a270b50e7214bec232c51faf918d4d220490ea1273e016280e56c3d4b06075fcb9feb528bd SHA512 716dc1d84d1eddcec15ec4b87c0c7454acda58ebb94ed5e7a1f5a79ec0a04d473c6dc9e7eb6649986346743cf8a673bdc25e714c221fefd0f05e0925a0f5b0c3
-DIST qtscrob-0.10.tar.bz2 132507 BLAKE2B 168bc3747bb48e7c5fedbaeb66cf12c4d7230fb240fb9b034b576f739ef55c497cdb6d8383bace8a00ad54890882134598777acc826d8ced195488b932123e92 SHA512 d743976ef26c4f61402187930ac2cfba71bc4d7079e1166bdb34115196c99d3e0093a4df06d4b0eda24ab4f0f6fcce840812fd2d1dff847dc905adc9a74127c5
 DIST qtscrobbler-0.11_pre20130123.zip 298519 BLAKE2B 36d3c3fdf59aa7fd9127c0200b03a6427f6fa27cb40e144f10041a25ba977e40fc5f63547596cf93f797d94e741a4a159c5e1aa48f8742d7738d1c113b22aae8 SHA512 24de4a45d4b31fb3c544b963b97b8716b8472a0dfde1bd2fd6bf101785f22ef07ff34fcd9ce7028fe231b215538bb8e4c3248c234feb870a3adeb4c0b259d646
-EBUILD qtscrobbler-0.10.ebuild 1403 BLAKE2B b3d9506261ad3564f472c8ab2c99576614b78b8e5d5990b941007e1ee40b98020c9dc482bd0e2f1d48d7606f07468474ae1a7bdd4b3fa414f2200c81d1c90dc8 SHA512 37d29012f2666a44ebb8ecca08b65d5563c9ca3bf7c6b0404315c989159af5ac2818b046f7ab8da674b329fff066361099ea6489ab71ce756f866a8679f8d6ff
-EBUILD qtscrobbler-0.11_pre20130123.ebuild 1252 BLAKE2B fceac0322c37322d68121758065c75a0cd2365f8f1ebfe065d6b3825f02c028e08b1470d98d8e58644c16236253377bc63cd25148739893e47c2358d7483ca35 SHA512 13ba696cdfa8a564144107a61af46ee764edbfdc8ec4e0cce22c21709771d0afe23a58905caf8fef1928fe6fad988912e0abae64133df67e922313e53d249955
-MISC metadata.xml 410 BLAKE2B c410c23c16a0ca646666e5eb4e6569661b340b90c0dd824cf43be35963aac14f099aaade7cb2f188ec4d9b9dbc75015ed9afc062a53be92060c775ac31f72140 SHA512 66998d7596e0dabf7b01af9fa59bd2b4b9d74b5cdd6e902ecbabf81683ff5f84ebf0d4d3dd876d19e510c886ceff741f9ebe163a5214c7f845f256b73601a401
+EBUILD qtscrobbler-0.11_pre20130123.ebuild 1251 BLAKE2B 094405e5dcd19615efde5fc392f5f42a0087e75e25f028ff3f45b5682afd50d1708cdb37bdcba8d48bdc20a93fccefe67d8fbc8fda5f640525109e0b84939985 SHA512 37b3d7419fb6dd0505f7cd2a64b42ae0b29503cb47ab0afbf54ffe9c5450b45c4a168b8d506d7ce1a3b563455a49d687dd12b4104f2748db676aff6a6b8b1ded
+MISC metadata.xml 340 BLAKE2B 350f5459a036f9c55c558bc8f7d9ab02a3b9045eeed136d8ef2963a19c9e3ca281dbff32ac8259333b625ca86ff66a8a747f6e5893baf643f5a1d7318303511d SHA512 67534a9d49ba6af88e23b14129c377309124be860237efbe926ba870f554aac980522cf7c791fe2075da689670994487631760c986a7b11834a2f2f9b48fc317
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch
deleted file mode 100644
index 0558b72c9bf5..000000000000
--- a/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/cli/Makefile
-+++ src/cli/Makefile
-@@ -1,4 +1,4 @@
--CC   = g++
-+CXX ?= g++
- mingw = false
- WINDRES =
- RES  =
-@@ -27,7 +27,7 @@
-     LINKOBJ  = scrobble-cli.o libscrobble.o md5.o ConvertUTF.o mtp.o $(RES)
- endif
- 
--CFLAGS = -Wall -O2 -g $(INCLUDE) $(CURL_FLAGS) $(MTP_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDE) $(CURL_FLAGS) $(MTP_FLAGS)
- 
- .PHONY: all all-before all-after clean clean-custom
- 
-@@ -37,22 +37,22 @@
- 	rm -f *.o *~ *.d $(BIN) $(BIN).exe
- 
- $(BIN): $(OBJ)
--	$(CC) $(LINKOBJ) -o $(BIN) $(LIBS)
-+	$(CXX) $(LDFLAGS) $(LINKOBJ) -o $(BIN) $(LIBS)
- 
- scrobble-cli.o: scrobble-cli.cpp
--	$(CC) -c scrobble-cli.cpp -o scrobble-cli.o $(CFLAGS)
-+	$(CXX) -c scrobble-cli.cpp -o scrobble-cli.o $(CXXFLAGS)
- 
- libscrobble.o: ../lib/libscrobble.cpp
--	$(CC) -c ../lib/libscrobble.cpp -o libscrobble.o $(CFLAGS)
-+	$(CXX) -c ../lib/libscrobble.cpp -o libscrobble.o $(CXXFLAGS)
- 
- md5.o: ../lib/md5.c
--	$(CC) -c ../lib/md5.c -o md5.o $(CFLAGS)
-+	$(CXX) -c ../lib/md5.c -o md5.o $(CXXFLAGS)
- 
- ConvertUTF.o: ../lib/ConvertUTF.c
--	$(CC) -c ../lib/ConvertUTF.c -o ConvertUTF.o $(CFLAGS)
-+	$(CXX) -c ../lib/ConvertUTF.c -o ConvertUTF.o $(CXXFLAGS)
- 
- mtp.o: ../lib/mtp-libmtp.cpp
--	$(CC) -c ../lib/mtp-libmtp.cpp -o mtp.o $(CFLAGS)
-+	$(CXX) -c ../lib/mtp-libmtp.cpp -o mtp.o $(CXXFLAGS)
- 
- install:
- 	install -D -m 755 scrobble-cli -p $(DESTDIR)$(bindir)/scrobble-cli
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch
deleted file mode 100644
index d6802751f0e0..000000000000
--- a/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-g++ -c ../lib/mtp-libmtp.cpp -o mtp.o -Wall -I../lib `curl-config --cflags` `pkg-config --cflags libmtp` -DHAVE_LIBMTP
-../lib/mtp-libmtp.cpp: In member function ‘void Scrobble::mtp_iterate(bool)’:
-../lib/mtp-libmtp.cpp:104:30: error: ‘free’ was not declared in this scope
-
-http://bugs.gentoo.org/405667
-
---- src/lib/mtp-libmtp.cpp
-+++ src/lib/mtp-libmtp.cpp
-@@ -16,6 +16,7 @@
-  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
-  ***************************************************************************/
- 
-+#include <cstdlib> /* free */
- #include <iostream>
- #include "libscrobble.h"
- 
diff --git a/media-sound/qtscrobbler/metadata.xml b/media-sound/qtscrobbler/metadata.xml
index 2ef2af033cb1..ad4d7db42b1a 100644
--- a/media-sound/qtscrobbler/metadata.xml
+++ b/media-sound/qtscrobbler/metadata.xml
@@ -5,9 +5,6 @@
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
-  <use>
-    <flag name="cli">Build commandline client</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">qtscrob</remote-id>
   </upstream>
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild
deleted file mode 100644
index c03b41f39d2b..000000000000
--- a/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils gnome2-utils qt4-r2 toolchain-funcs
-
-MY_PN=qtscrob
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Updates a last.fm profile using information from a supported portable music player"
-HOMEPAGE="http://qtscrob.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli +qt4"
-
-RDEPEND=">=media-libs/libmtp-1.1.0
-	net-misc/curl
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-Makefile.patch \
-		"${FILESDIR}"/${P}-free.patch
-}
-
-src_configure() {
-	if use qt4; then
-		pushd src/qt >/dev/null
-		eqmake4 ${MY_PN}.pro
-		popd >/dev/null
-	fi
-}
-
-src_compile() {
-	if use cli; then
-		tc-export CXX
-		emake -C src/cli
-	fi
-
-	if use qt4; then
-		emake -C src/qt
-	fi
-}
-
-src_install() {
-	if use cli; then
-		newbin src/cli/scrobble-cli qtscrobbler-cli
-	fi
-
-	if use qt4; then
-		pushd src/qt >/dev/null
-		newbin qtscrob qtscrobbler
-		insinto /usr/share/icons/hicolor/128x128/apps
-		newins resources/icons/128.png qtscrobbler.png
-		make_desktop_entry qtscrobbler QtScrobbler
-		popd >/dev/null
-	fi
-
-	dodoc AUTHORS CHANGELOG README
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
index da8847b4c40f..dc4f5ac6824a 100644
--- a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
+++ b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceforge.net/code-snapshots/git/q/qt/${MY_PN}/code.git/${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index 95c8775d5a50..ecabfb22b0b2 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -4,6 +4,6 @@ DIST quodlibet-3.9.1.tar.gz 3850929 BLAKE2B c4317521259f1d46e927276ee8bd927afd72
 DIST quodlibet-4.0.2.tar.gz 4730188 BLAKE2B abe5cdbb6302bf381a7426145c25f6c1e205a2be8ffd801b93ed47e0a23764c142b59cd8de001458ef378fe70523308035517b82bfacbc1213eb7f4a86dcdb7d SHA512 c8c1f823ace03f69fab848f8e312edf9aa1e1e417a843ad2e08d75a0e26a0e095b7050e737be450e5b0b72c7c51b16d1d2143e297dde67bae310b9cdb6f85e3b
 EBUILD quodlibet-3.7.1.ebuild 1664 BLAKE2B 2b21f56d7273061f1c20388896b64ee93b5ade1bbd98dcc7446b3e24094a92a79ece88499c436998c84e12fb532709590e9471620c857d96a457b4d39718d644 SHA512 22b3a19022cfc91dc77fadbfa87e579a938af73e7805df4d304d191ebc3bd1a0d1f6b6624bdb1c4908cf175590b950ab6060fb99937afa83023e38b87d7ce450
 EBUILD quodlibet-3.8.1-r1.ebuild 1717 BLAKE2B 1d5a8105c82a70394a4602244c3d7734352c02c9ff4e4b32f0802d93a5f4f1bc355397b61f48c2e5ce0b79ddaa9145d39bef54f0f6698ad5b92805affb38d7b8 SHA512 784706ebf88f4a18e869ed4bb6a89ed78c2a5c9fef8b96d4c8358e11d122afcbf831b1028c2d47450b1cf89e0c6c379164cace47f6314045eb3ac9f600be7828
-EBUILD quodlibet-3.9.1.ebuild 1776 BLAKE2B ea30c039fb930d1480943d3e3311318bbc615489833615dacdb20076df7c2ad9d934af518f90b19d7f925cc0e40b2c801ecc12b7fab116bf6e5282be33812f40 SHA512 f80e1e31c053d01dae188726ff2100a2c819e2108119e88374ecd1cee2dc5cda3cb4756f59ad8f442ca0dbcce44394f6c456a37bee84ccfbcea9bed46f869941
+EBUILD quodlibet-3.9.1.ebuild 1762 BLAKE2B a19a65c10150735cc5ac8b0ceea6fd38437065e1ff8041f4300574e6987a42a0e3c2231167e625d3e22a483a7755e63331d6de26dbd97bd0531c74006be81e19 SHA512 37131164403e18228e787385b04bf4cb517d340b48925a64b9bb83a561c84749542818ceea10915849406398762268d338a83cbbdbc5466184f82c13416130a0
 EBUILD quodlibet-4.0.2.ebuild 1611 BLAKE2B d1a37f206b0bc5014bdf3da1e361006c03916ad9fc6763a330651a4c44eebf45ad1dd0b406b92f4638f019e6f60293dec1440f63b8afe573c48e90100cbef8f3 SHA512 1caf57d3f99aae71e015db3ed126265e08b9a5a19bc4adbf86028a7e27cfe9c64a1fd3c4db18ec1f40258e2b405cb68f3e049aeae858ea95a908bc8797697644
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-3.9.1.ebuild b/media-sound/quodlibet/quodlibet-3.9.1.ebuild
index 1211cda94c3f..079481626d56 100644
--- a/media-sound/quodlibet/quodlibet-3.9.1.ebuild
+++ b/media-sound/quodlibet/quodlibet-3.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="+dbus gstreamer ipod +udev"
 
 RDEPEND="dev-libs/keybinder:3[introspection]
@@ -63,11 +63,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	xdg-utils_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	xdg-utils_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 70f94aeaa252..f423cba8c6d0 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,6 +1,7 @@
-DIST spotify-client_1.0.72.117.g6bd7cc73-35_amd64.deb 90872908 BLAKE2B 9eb06a175c8321effc4404c0a2abc978bed4e4f7654d907b4e8232249b5d07e70f54a39fd1ec7cc4e14f1348d1a71ca6abf3622992063e2402d2100f227c627a SHA512 fd33a5cd86edd4bf759849669516ffce35d89a77c6fcfb3ed0eb0ecb69024de5011499f36e48b8d37a873eb47da89eb21d9b9c7d280c498830a9fb1f8785db60
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.0.77.338.g758ebd78-41_amd64.deb 96717978 BLAKE2B 91a4e8099076e7ccb9f44e67f2ba4ee2899ef6c5c818093a62fafd7e31e84b3bd6f44aa1439d4c0c9b8818be89c6898067ca1694946bf92da19fd92ecde6d2e7 SHA512 c0c08d4f6af8ffef3d9784e176c6112975ce56c7eec961df11821f4ac52785dc090e794c25874fce004da5f3e42979402e921ef12fbe1cfc80f02034448724db
-EBUILD spotify-1.0.72.ebuild 3355 BLAKE2B 7d719c84c63cbf43013ff951b73f68c16da205340f29d6729eebe8584460125898285fdff32e84b4c918678ffef7acf7df64de6104cb24f7d00239edcd905e2b SHA512 f12f729906db68e06e756f08524afbf8f92f09c8d57bf2c47316fe46b05442b4a342bf5d0622f4dc647243dfa46700c343d01b0968c84853d6492fbc99cdc319
+DIST spotify-client_1.0.79.223.g92622cc2-21_amd64.deb 96544088 BLAKE2B 084d0131911dff2c8913a8160375ae13f6b8c21927e533d88a16506455b6c52545d7cc426ec35bf855561328586e6d08c4b7f9bfc8aefb7ce39399ec0b9ac89e SHA512 0a45594ab920fc963cf78a71d5b77c39648b77eb4437345a5220bce5f7ee760b6a970019b4bc8fba51856c8cbc27ba0c4ee5ac0f514894fa36a68fff5ccbcd4e
+EBUILD spotify-1.0.72.ebuild 3417 BLAKE2B ea84409bbe8dc6eb029fe6ee0393aacb9e8fbc15f018cca4887e4f7c1ff13c6417aa0b750fe0bc08860126a0c53e39e14f2ab8f291deca5536ce5b436b3e58d4 SHA512 a9d1fced3b9ec9518a7e0eab950895c270e77d377211ee68d8a49b673bf1ee77dceb9180e417b8dc5323b82f1a44b44e15b28b287602218bb7bcca86a88ba51b
 EBUILD spotify-1.0.77-r1.ebuild 3643 BLAKE2B e1b1c93e01a3782b45d6b4d6424c0ae109933dbbc1275325db295f493ba513bd4d2c4ff1e06750d9c1417b0300cead228f6f17d2bef27e1eac686ff1cc3e178d SHA512 33caa3cd3b4e9f8e90409ba7f001a6d81320a5825dc51efbcb3e34d67a4e173875a6406feb74cf301a512306e94484f8fa8e2671e39adc38cd9f945b31b0c983
+EBUILD spotify-1.0.79.ebuild 3643 BLAKE2B 8fa1949b9e3deba87697a4b35d3090552f6d43e2cd0765ee44a90db712d0f631c0a9fc4da4c49585aa84c419c965e46dde35f1f28aa0daa293ab08e025eab996 SHA512 ec895f9999e51cffeaf9d0c09731b45e59feb3632c7e53c2fdb4dbc8238481bcb97e76692389efafc6a0e780fdd56e6aea0ac6e1ff031403812faea3b84e9c20
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.0.72.ebuild b/media-sound/spotify/spotify-1.0.72.ebuild
index 7cf02df1c2e8..3b8d57bd25aa 100644
--- a/media-sound/spotify/spotify-1.0.72.ebuild
+++ b/media-sound/spotify/spotify-1.0.72.ebuild
@@ -6,14 +6,15 @@ inherit eutils xdg-utils gnome2-utils pax-utils unpacker
 
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-BUILD_ID_AMD64="117.g6bd7cc73-35"
-BUILD_ID_X86="117.g6bd7cc73-35"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
-	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
+#BUILD_ID_AMD64="117.g6bd7cc73-35"
+BUILD_ID_X86="117.g6bd7cc73-35"
+#SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
+#	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
+SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb"
 LICENSE="Spotify"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="x86"
 IUSE="libnotify systray pax_kernel pulseaudio"
 RESTRICT="mirror strip"
 
diff --git a/media-sound/spotify/spotify-1.0.79.ebuild b/media-sound/spotify/spotify-1.0.79.ebuild
new file mode 100644
index 000000000000..4d18560b4d83
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.79.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils xdg-utils gnome2-utils pax-utils unpacker
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+BUILD_ID_AMD64="223.g92622cc2-21"
+#BUILD_ID_X86=""
+#SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
+#	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
+SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify systray pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=">=dev-util/patchelf-0.9_p20180129"
+# zenety needed for filepicker
+RDEPEND="
+	dev-libs/openssl:0
+	dev-libs/nss
+	gnome-base/gconf
+	gnome-extra/zenity
+	media-libs/alsa-lib
+	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/mesa
+	net-misc/curl[ssl]
+	net-print/cups[ssl]
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	dev-python/pygobject:3
+	dev-python/dbus-python
+	libnotify? ( x11-libs/libnotify )
+	pulseaudio? ( media-sound/pulseaudio )
+	systray? ( gnome-extra/gnome-integration-spotify )"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for systray integration
+	if use systray ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+
+	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
+	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
+		|| die "failed to patch libcurl library dependency"
+}
+
+src_install() {
+	dodoc usr/share/doc/spotify-client/changelog.gz
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+	ewarn
+	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
+	ewarn "Run"
+	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
+	ewarn "Then log out and log in back to KDE."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
index 6ba9358d39dd..333d63c6e9ff 100644
--- a/media-sound/teamspeak-server-bin/Manifest
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -5,7 +5,7 @@ AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b
 AUX ts3server-bin 323 BLAKE2B ab3fb5522ffef33d4517d76f01c91091cb1322e1433ac158c2aaaf18c56f44a74875e3ae82e7c39209207291a668104bc4d08d54dbff7042e4faebc0e54104cf SHA512 578bee3c35fc6bc5a06ceebbab1aaeab6201fdb32a13e9c2473dffd78282690f57b1bc277a973006fb573cf9f1a11c0643c0479ff1a9e1318c015437086c6c42
 AUX ts3server.ini 538 BLAKE2B 10dd1ca73bf81fb53832f1e6d4e763aae965102f93ff12b057672b3b201a281bca009cf22481bf5b1fcf09af49b120f7eda9b21c85686f15af25d1968c62c23c SHA512 bd03d3de15625009aa2cfb49b8dc0f2a4832ee8cf1d76b869a8c1da7882e500df8d07ab19a94035ffaaed32a9bff6545c42d8dd25086f60dd7804f72b8f36974
 AUX ts3server_mariadb.ini.sample 556 BLAKE2B e7ea14b839f4e41c67726f9167cab198673d5a1109085b44fbcfe87e1c7f4a79670cec512b59c16fc4d08bc8377de9ba3802b72695bbb564b70405b783ba99e9 SHA512 ee74ef7e4bd7ceec81584586a20fe688d74171541154a13db55ae9fb7cfd210a13b6821aa3668edb76a13035263e30ffa94abbfa55ccc390315568663d6e6e2d
-DIST teamspeak3-server_linux_amd64-3.1.1.tar.bz2 7798155 BLAKE2B 4962968b33eaaa07043cfaa23d020d3d7dcff19b9e380f797196d382a4d004fb0ca2a56246eedf246f796e1bea8f719e80e715b2eda67e5340b7042dd1111a57 SHA512 8561cbeb16a44889ddaa6ab054b47abaaa6a5c942f39c308f6afd2687110bc9e142a8711afe557fa22fe92d1395b844a0eff8c8043921aee4e8070571bee6e44
-DIST teamspeak3-server_linux_x86-3.1.1.tar.bz2 7658201 BLAKE2B 1625200a625ad7615241341846e992de8567c7fa7f6fbeb5234953ab696d60809591f870157e947b06953cb421019c7d0cf920bd0ba65968c4178284b0154206 SHA512 952e2e5d467f68b6f5f0bfc0e4f5a71917c2c14809aeccc64038679e6fd7a20f0794e0662f7a2fec1827a5a99249d1df3a673fb53e324524b4320c64083608c6
-EBUILD teamspeak-server-bin-3.1.1.ebuild 3646 BLAKE2B d6b39d6fc98dbd4e0e407d07745c5a90e6a937abf294a34037e741b17884956fe870bf11a8f421dc3546959baa3fe76ac668e980bfcdbaba4b209776c344f61e SHA512 af844cb9889a8bdc9c0156a9619e2499efac40c8bf5fa3e7e88d961e771494d822fa5c231b33cfd6c7204722c9f89012d2a54e5fee927efbbd1dd920342b9364
+DIST teamspeak3-server_linux_amd64-3.1.2.tar.bz2 7816668 BLAKE2B 4421a439e07ce6dac2556a95818bae7be91622ceea5c597f1fd02ee13815f760086dea13a3ac11a55c928ccfc4b134bb97c0f3092def85ff765e311d6ef69459 SHA512 42993b4cc881ca2bc7d7deb5eaf4e7a9cc3be462abba0f174d6074f0ca18bf59cbe8607dac5a9750331d28ac1984527a8210f53cf6cf077be86b26d141c7bc78
+DIST teamspeak3-server_linux_x86-3.1.2.tar.bz2 7676301 BLAKE2B a4b7557e215612f11bd4ee892dff199d0017e6af7a24bc3dce83a4ac6ddbe807b3960b66c9948298c4463ad2d08aedf27468487f91b15d197d0e2c01b7771956 SHA512 04dce6831332e44ff0edfdc664f422616522bb342338a2b6bb2cd73aba5cc5965dfa4c77fa7c041c06727a3f50fd842142198fd99568c1db6c9810f07accdb48
+EBUILD teamspeak-server-bin-3.1.2.ebuild 3423 BLAKE2B 175a99ff927642828cb40bd41b7ec51a39e3d421eab279dbe5126370df40f90404ec8a3c6850d4d4a10308dbefadce9607d338f49012b23b6f1712066296f6b5 SHA512 959677ab6bec85ee858223f7fe952fad48ea3d5669d0168dee56c9558cd3562e4af24b2329feb9a78cb252c2dd5e4051ef0e24497b735d5b2c4653c2112e242f
 MISC metadata.xml 659 BLAKE2B 77a9ce51277977d958712db9e729c1c6517ad29a3c87b0f775fe7c414273cf3fee43ca070894065949f766a22019af72e7a1a23fcbacd4641fa8c43571aa6a7f SHA512 2404a4075934843c4599d42c99e6042f99d9131066c9ec4a36ca08f361d01c9c15050676dc7760a34eff1a173be41cfd91c270fe616696dd36b08cae4f7fda53
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.1.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.2.ebuild
index 94b2f7e25561..5bbbf749cb09 100644
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.1.ebuild
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils systemd user
+inherit systemd user
 
 DESCRIPTION="TeamSpeak is software for quality voice communication via the Internet"
 HOMEPAGE="https://www.teamspeak.com/"
@@ -48,27 +48,22 @@ src_install() {
 	insinto "/opt/teamspeak3-server"
 	doins "${T}"/.ts3server_license_accepted
 
-	# Install binary and wrapper
 	exeinto "/opt/teamspeak3-server"
 	doexe "ts3server"
 	doexe "${FILESDIR}/ts3server-bin"
 	dodir "/opt/bin"
 	dosym "../teamspeak3-server/ts3server-bin" "/opt/bin/ts3server"
 
-	# Install libs
 	exeinto "/opt/teamspeak3-server"
 	doexe "libts3db_sqlite3.so"
 
-	# Install sql
 	insinto "/opt/teamspeak3-server/sql"
 	doins "sql"/*.sql
 	doins -r "sql/create_sqlite"
 
-	# Install config
 	insinto "/etc/teamspeak3-server"
 	doins "${FILESDIR}/ts3server.ini"
 
-	# Install init script and systemd unit
 	newinitd "${FILESDIR}/teamspeak.initd" teamspeak3-server
 	systemd_newunit "${FILESDIR}/teamspeak.service" teamspeak3-server.service
 	systemd_newtmpfilesd "${FILESDIR}/teamspeak.tmpfiles" teamspeak3-server.conf
@@ -87,7 +82,6 @@ src_install() {
 	#	doins -r "sql/updates_and_fixes"
 	# fi
 
-	# Install optional docs
 	if use doc; then
 		local HTML_DOCS=( "doc/serverquery/." )
 
@@ -98,7 +92,6 @@ src_install() {
 		dodoc "doc"/*.txt
 	fi
 
-	# Install tsdns
 	if use tsdns; then
 		exeinto "/opt/teamspeak3-server"
 		doexe "tsdns/tsdnsserver"
@@ -112,10 +105,8 @@ src_install() {
 		dodoc "tsdns/README" "tsdns/USAGE"
 	fi
 
-	# Install docs
 	einstalldocs
 
-	# Keep directories
 	keepdir "/etc/teamspeak3-server"
 	keepdir "/var/log/teamspeak3-server"
 
@@ -127,7 +118,6 @@ src_install() {
 	# fi
 	doenvd "${T}"/99teamspeak3-server
 
-	# Set permissions
 	fowners -R teamspeak:teamspeak "/etc/teamspeak3-server" "/opt/teamspeak3-server" "/var/log/teamspeak3-server"
 }
 
diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest
index 4753a9cc334c..5d242b5359d4 100644
--- a/media-sound/terminatorx/Manifest
+++ b/media-sound/terminatorx/Manifest
@@ -1,4 +1,4 @@
 AUX terminatorx-4.0.1-gtkcombotext.patch 437 BLAKE2B 582d82d04bd443188325f127a9766f6b35d6547339a839bbc7460f800bcf0721e30c6c77e42cfcfb5a91c683a11c90fb967849e8b7577e68dc11448b1a1f9873 SHA512 d801d60deb2d18444979791246c9eac7b41f2e7f8ecf5fa25a9b4d9294b0c0bd5dc107ac63aab04a85962efdea316f43df9736ef6009a174f1e8d6a7eb53c1c3
 DIST terminatorX-4.0.1.tar.bz2 1832692 BLAKE2B 61eeb6362cdf56cb73df3bfbff65cf3699a0ef686d77894b87feab5f25f927267bc28573c3ee41981ded3b452b1d37c035260ffbe0fdcf6d0b0c0319c61a6137 SHA512 06128633e128f2158367dcde0e913dafc68d62644e7a5182a2391829dadcb9c46430d0cac16cb17113939623266f32cb4624a8548a51b8c01bdfa2860a6c0093
-EBUILD terminatorx-4.0.1-r1.ebuild 1406 BLAKE2B 42dbae32ae93ab1f72602280c408230703c6f5d651ff4e43e6b3902cb9a860cf5e75e7c19d8c9979b9f80f7f28a99c3f9570fc646702943244ecb3e992f54a46 SHA512 809b217a45de7d55092c4f5bdf22574dfe2a99ce978f270e2b814572c3d4d14ebb9e56e8b0fa8806fad3c1b2125384a05a44f0eace00b00b43236f1c7132944b
+EBUILD terminatorx-4.0.1-r2.ebuild 1363 BLAKE2B 7d536c015a6f5c90086586213cb27d303b1f7f7f9e76672f8e48a6479cae6a3821a62beaff61308f3af71b5868f8d7072242f328153a16f8e8ab8bcef44a5c36 SHA512 7f13d3277be0ce8ee10c62b36c52f5fd3fe94a251bd7dbd247eefff2ddb806c8d3369753279adb86382c6b4f2533a05350cb8d4c1b33607a852586b250d84448
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/terminatorx/terminatorx-4.0.1-r1.ebuild b/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
index 08a23c074a74..30a6bd889148 100644
--- a/media-sound/terminatorx/terminatorx-4.0.1-r1.ebuild
+++ b/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
@@ -28,9 +28,6 @@ RDEPEND="
 
 	x11-libs/libXi
 	x11-libs/libXxf86dga
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/xf86dgaproto
 
 	dev-libs/libxml2:2
 	media-libs/audiofile:=
@@ -39,6 +36,7 @@ RDEPEND="
 	media-libs/liblrdf
 "
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
 	app-text/gnome-doc-utils
 	virtual/pkgconfig
 "
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
commit	a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree	852c90a4bf354c30ea66504f70bfab5401fba18d /media-sound
parent	5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)