gentoo resync : 16.06.2019

35 files changed, 211 insertions, 650 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 939ca63355dc..ac923ceb2ace 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index f393cffb0c8b..185ee1aca3f4 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -2,5 +2,5 @@ AUX gsm-1.0.12-64bit.patch 591 BLAKE2B f72688a27c9e52bd3e0b40018f2e035da4284c40e
 AUX gsm-1.0.12-memcpy.patch 301 BLAKE2B 887d9dd0c9220284f1ef69bad73e5e311994fb020bc06742cd931fead416937ae25d0e3364432be5c4cc408c57fad80bb524fddf7db75bf53e70158da4a8f089 SHA512 922999a35a5d8f646ebe61d7b7aacadbd75848a5446462a8173e040f7d4b0748c55196c1be0653752f076a01d7eb07e5bfce3fe23b81a38f1ee9f97d61cd6200
 AUX gsm-1.0.13-shared.patch 3723 BLAKE2B 4bd926e470d7c120560fe2378dd87496e47760efe293db5e9b1b61cf5075cb737425ca1e7c6b7a92068c95416603b3a5c46741e04f30a477c8d39b0b0c33e63f SHA512 0872ddb6c93ab6f7082f4a999a39439ceaa8337bf72c0a690ebbf1561a605d2664ceec14eba81a36ab244c3cfe3f3edafe3ee76869a68aeffe6fcc3f12026957
 DIST gsm-1.0.13.tar.gz 65318 BLAKE2B 22bb79e3afd9a2e99041693288342b55969207223486200d4aebc61908930040b6b766a9bf673ec6b484eeb95833684c79f34c95d32da17cfb4c36d025004858 SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
-EBUILD gsm-1.0.13-r1.ebuild 1524 BLAKE2B ac250cfdf262d5ead139784fddcd404d7738450fe1fc69e90d86bd67ee5cc6c61be6286bc5c559c42c393028ed15d58b9cc0cb37578b857f207e6ca3b6ab6fad SHA512 65c2e3c601d9ad63a769eb23086321070776d732c9ec8013a0ac23252af77efd3aeeac0f866b9ca30301dab52d5aeff7293bfbb481a709e29a91e8759909aa34
+EBUILD gsm-1.0.13-r1.ebuild 1529 BLAKE2B c77358a598f6d480c3d47d1c95b4326380f554959f4f9f46fec0ce268e64bf2fa514b6f53af8e57ae85515537fd149ba5abc346b34230704d0627833657ebe44 SHA512 c19ffe4b7818d752d9544ec7aef63daf8b67bddef90f1e1db56618cb4b0075ef898bc596bbbe682fccc9cb221d26514329885a3a53117528cbda2779e723f50f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
index 354c2a094ba0..6ca036cc100f 100644
--- a/media-sound/gsm/gsm-1.0.13-r1.ebuild
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -36,12 +36,12 @@ multilib_src_compile() {
 multilib_src_install() {
 	dodir /usr/bin /usr/$(get_libdir) /usr/include/gsm /usr/share/man/man{1,3}
 
-	emake -j1 INSTALL_ROOT="${D}"/usr \
+	emake -j1 INSTALL_ROOT="${ED}"/usr \
 		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" \
-		GSM_INSTALL_LIB="${D}"/usr/$(get_libdir) \
-		GSM_INSTALL_INC="${D}"/usr/include/gsm \
-		GSM_INSTALL_MAN="${D}"/usr/share/man/man3 \
-		TOAST_INSTALL_MAN="${D}"/usr/share/man/man1 \
+		GSM_INSTALL_LIB="${ED}"/usr/$(get_libdir) \
+		GSM_INSTALL_INC="${ED}"/usr/include/gsm \
+		GSM_INSTALL_MAN="${ED}"/usr/share/man/man3 \
+		TOAST_INSTALL_MAN="${ED}"/usr/share/man/man1 \
 		install
 
 	dolib lib/libgsm.so*
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index c858be6628a5..7d0ac712cd55 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,6 +1,5 @@
 AUX hydrogen-1.0.0_pre20180301-gnuinstalldirs.patch 4495 BLAKE2B 8342dd95dc1cd5ad89948d417c440e791e30c62e365fe9d1d3f8d7c5fa40180475d93a27958e64d4b587846067a4266f87a21d76e0b6ea57acde9154fb5d2e4c SHA512 cb7b068bd0690630ac49060aa8cbe2b3f250f6670ccd3035ad0b412df248c21753ea094dc67d5e3ceb80343b066b833cf3377b2c166e58119de1c112c5bb4c42
-AUX hydrogen-9999-gnuinstalldirs.patch 5411 BLAKE2B 74cc202dbab0243e14ce489a5c2db4385bf6eaee363b38ed151684a2829d4794ccc70c18fe55cd2cdd7043c61025d62f39469023441071be8c64c6fc31e18742 SHA512 231c4af81c1ca5bb5ec0d3aadccee16b653e0ec79ac4129d9178da6c4e509f2e3655ab0c9f77c2835b599f15197626f77cb12edae3ef455e8233042381026425
 DIST hydrogen-1.0.0_pre20180301.tar.gz 9865493 BLAKE2B 7a29440189b51f9e85560823a1e41b9a7392b51caf6808c0e06ac693a028580f78fac8f3bfe08eda5800a69d00b0f9b6235b6b5c0b7f19971e6bec4c1cf45d6d SHA512 376013ec99c3a3cdb87c03b11919c365b579a81377879ecfe11ed49ae9e7548a938ba23882e32e1921d6a1085ea7f7bc4e8520bc49bc61311dce1a01c8dc5e47
 EBUILD hydrogen-1.0.0_pre20180301-r1.ebuild 1937 BLAKE2B 1338ca9bed21852edf5219f68a1584b4d2ac7ae46fc63f47ae209f261aeba6c69990a773974e5d7eceb7baf34461aa272bb11837b7b9d642b6972104b8f17bbf SHA512 4c5411a87f399211430ad30c94d933494b919bf0ac62e23bda32aadd7af7988c11f1bb924b5cd3ece46a61b743ff6aa65786eab91e319174560b1129a54312cc
-EBUILD hydrogen-9999.ebuild 1794 BLAKE2B 90964a2d21cbb687c485dcbec2f971085927234fe0ba7ca75b8de50ffeb3f52aa3178c8af838a9eef2098c82a7784f950097c278ffd276ce3e533dffb3047c8c SHA512 3a3f6e6b5134f36b3f208246a805c84351b4f24e3a898bfb030f652a3893a3815c2bcbc807c6ca764cfe151f6aa8888459b84007cb25455673b9e910c39cb5d8
+EBUILD hydrogen-9999.ebuild 1741 BLAKE2B e6be5818f19da7dc4e8671d9781ccbb0eea72f4ae4e82211ba42955b193b214690912a078be74df6e1e6cc52698dced9cc2eb77bc030af76e27382c3e7d64974 SHA512 67f86d40c7efbec7d8416443d212696e4492b0af4cb98d3e34834b7c568b3ca2b0aab577e38d5eccae4efa94a628eaa05c640ec27fcd4f460ae964c0d01b2fee
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
deleted file mode 100644
index 14babedefa5c..000000000000
--- a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 64e251765e58b6948953f0bbc2aac05042daaa55 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 1 Jan 2018 11:52:18 +0100
-Subject: [PATCH] Use GNUInstallDirs
-
-Fixes multiarch and deprecated man dir location.
----
- CMakeLists.txt            | 19 ++++++++-----------
- src/cli/CMakeLists.txt    |  2 +-
- src/core/CMakeLists.txt   |  6 +++---
- src/gui/CMakeLists.txt    |  2 +-
- src/player/CMakeLists.txt |  2 +-
- 5 files changed, 14 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b18508a8..76305ea7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,6 +30,8 @@ ELSE()
- 	SET(DISPLAY_VERSION "${VERSION}-${GIT_REVISION}")
- ENDIF(VERSION_SUFFIX)
- 
-+include(GNUInstallDirs)
-+
- SET(LIBSNDFILE_VERSION_PREV "1.0.17")
- 
- #
-@@ -144,21 +146,16 @@ IF(APPLE)
-     #Without setting this, installation would go into /usr/local, which does not exist per default
-     SET(CMAKE_INSTALL_PREFIX "/usr" )
- ELSE(APPLE)
--    SET(OSS_LIB_PATHS "/usr/lib${LIB_SUFFIX}/oss/lib" "/usr/local/lib${LIB_SUFFIX}/oss/lib" )
-+    SET(OSS_LIB_PATHS "${CMAKE_INSTALL_FULL_LIBDIR}/oss/lib" "/usr/local/lib${LIB_SUFFIX}/oss/lib" )
- ENDIF(APPLE)
- 
- 
- #Installation paths
- # TODO remove data from path
--SET(H2_SYS_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen")
-+SET(H2_SYS_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/hydrogen")
- # TODO remove data from path, could be .config/hydrogen
- SET(H2_USR_PATH ".hydrogen")
- 
--#Changing this to user writable location will allow successful, non-root, deployment (e.g: make install).
--IF(NOT MINGW AND NOT APPLE)
--    SET(H2_UNIX_ICON_PATH "/usr/share/pixmaps" CACHE STRING "Freedesktop default icon path.")
--ENDIF()
--
- SET(MAX_INSTRUMENTS 1000 CACHE STRING "Maximum number of instruments")
- SET(MAX_COMPONENTS  32   CACHE STRING "Maximum number of components")
- SET(MAX_NOTES       192  CACHE STRING "Maximum number of notes")
-@@ -366,10 +363,10 @@ ELSE()
- 	INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
- ENDIF()
- IF(NOT MINGW AND NOT APPLE)
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${H2_UNIX_ICON_PATH}")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
- ENDIF()
- 
- #
-diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
-index f6cd04eb..7725dc83 100644
---- a/src/cli/CMakeLists.txt
-+++ b/src/cli/CMakeLists.txt
-@@ -20,4 +20,4 @@ TARGET_LINK_LIBRARIES(h2cli
- 
- ADD_DEPENDENCIES(h2cli hydrogen-core-${VERSION})
- 
--INSTALL(TARGETS h2cli RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS h2cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index db1333da..0ab61d96 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -57,13 +57,13 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION}
- #SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER   "${hydrogen_INCLUDES}" )
- 
- INSTALL(TARGETS hydrogen-core-${VERSION}
--    LIBRARY DESTINATION "lib${LIB_SUFFIX}"
--    ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
-+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-     # do not copy directory hierarchy
-     #PUBLIC_HEADER DESTINATION include/hydrogen
- )
- 
- IF(NOT APPLE AND NOT WIN32)
-     INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
--    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/hydrogen" )
-+    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
- ENDIF()
-diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 4030dc9a..2aeb17c2 100644
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -51,4 +51,4 @@ TARGET_LINK_LIBRARIES(hydrogen
- )
- ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION})
- 
--INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS hydrogen RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt
-index 72c270f3..836fc5b4 100644
---- a/src/player/CMakeLists.txt
-+++ b/src/player/CMakeLists.txt
-@@ -16,4 +16,4 @@ TARGET_LINK_LIBRARIES(h2player
- 
- ADD_DEPENDENCIES(h2player hydrogen-core-${VERSION})
- 
--INSTALL(TARGETS h2player RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-+INSTALL(TARGETS h2player RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
--- 
-2.19.1
-
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 5bcfaa020fec..db964f614256 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -43,8 +43,6 @@ RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		-DWANT_ALSA=$(usex alsa)
diff --git a/media-sound/kmetronome/Manifest b/media-sound/kmetronome/Manifest
index c3b075f6a2d1..c5b121a15f96 100644
--- a/media-sound/kmetronome/Manifest
+++ b/media-sound/kmetronome/Manifest
@@ -1,3 +1,3 @@
 DIST kmetronome-1.0.0.tar.bz2 225715 BLAKE2B f8d7d7307f61d1359a16902246ba3e4e64b39bbc2b982f4147fc9f08bdf0b78134c8b9e7c6ad487553d63db30fae007e6e2e6c8d888359be7554f2861bbb5192 SHA512 69290c56119de78a75863c8afd891fbff2d26eeb739a5e65938ba6238e522b1fb79edc6ac0264b912cb70bc3028a6245ab16cc3d22f19e30ea9a33817589f426
-EBUILD kmetronome-1.0.0.ebuild 781 BLAKE2B 613c19d51ca2e3ea9b9468628e8fb5e7d112de8f071e613cb1cb0d12750c6ff2a33ad21c8a75adeb103ee462c292f127e4f7d663c7ca78788b1cdce84dfd219a SHA512 bd6a0aa4246ae28f946c36fc21cedc4d452a54b4a60e73df8f4034752bcc1fbc895aba45f7cd3482d4c7db24a5cc7e1acbe6671d86af0862cd27a993c391ba0d
+EBUILD kmetronome-1.0.0.ebuild 620 BLAKE2B e6c234996e4f34733bcf1f36151beae296d2e2fc4dd1e0e0fbb91e25f796880edde58db8bff7408e8cfd8123cc572e277b799703cd337197385019d6be28a031 SHA512 6a6e5d4c9c4ded7cd9b91ed603e72339843a7eb599d0fd28f2f78e6c1b434fdcb531a8a3965f710080e29ad9d0f9aade9049003ff71e8f62685bce58d56bb56e
 MISC metadata.xml 443 BLAKE2B 876e9d079153472e0e765f0071063bd904b9ca42252af016611512091634add2a7adf2742217c424f8b7280eb11569f3cb97bf26b4f0652d1d072fa5c7b23739 SHA512 7c8104d0ad8340cea75364d5688924517c6b1f3d9ef7c71b73d8c9f6188ebc7aa22f366777a3e7395e55493a630610e674b5bd2e26f4d6a0fed13cedc4dac38b
diff --git a/media-sound/kmetronome/kmetronome-1.0.0.ebuild b/media-sound/kmetronome/kmetronome-1.0.0.ebuild
index 6de06d8f22f8..8adf01c87da4 100644
--- a/media-sound/kmetronome/kmetronome-1.0.0.ebuild
+++ b/media-sound/kmetronome/kmetronome-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="MIDI based metronome using ALSA sequencer"
 HOMEPAGE="http://kmetronome.sourceforge.net/"
@@ -14,7 +14,11 @@ SLOT="5"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
-RDEPEND="
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -22,23 +26,9 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	media-libs/alsa-lib
 	>=media-sound/drumstick-1.0.0
-	!media-sound/kmetronome:4
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
 "
+RDEPEND="${DEPEND}"
 
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+src_prepare() {
+	cmake-utils_src_prepare
 }
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 6f960f3efc2d..69b5e93567a1 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,4 +1,6 @@
+DIST lmms-1.2.0.tar.xz 14541000 BLAKE2B f53206c2a78104d250fd7eda06ea1c646ad40c2db66baa9ed333213900e33bcab5312c95d5864636930be1b798ac1a79754035e3aec3a3772976aefb80dd8191 SHA512 7d3476fbcbda49d75efee4161f6478656e38a517b6a3b24740ea354e223fba51210f45ff74b46fd1ac73fc6e65409226088b12e29558c91eb818da58734ab6cf
 DIST lmms-1.2.0_rc8.tar.xz 14318692 BLAKE2B 972404ab6ce517c748aad21528d5891af5d12c47d38a18f802fb3a5dfc5d6f3ee91cce14a6ff267341c06c9607328b018e1b612f7f0f550372a35038749a7bb3 SHA512 b8fb9c505d9f5e7854767bcd223c8578d4977e59d7bf64993fe0b57e00d1de87f8e77366c3195d8ea429eb3dd44c641e3dbecf27e64609e892a4453ab17d7343
+EBUILD lmms-1.2.0.ebuild 2319 BLAKE2B 660549b54242179f82ec39495f9600883252642a6b00acc75e4a1bcb8520c65364daaeaf583fa63014cf6d2ef5b9d8189e667d48eeb6d0082a7e0619b3cc64a3 SHA512 c599583adbaffcdca3bb5387a40a785047a44ad9267b71108a1c38f03ef051d934069e3e40726c371b0869affd42520e3eae857031e0ad1555b677b5c1da5246
 EBUILD lmms-1.2.0_rc8.ebuild 2404 BLAKE2B 4327d8dcf22d9a6d170843235fde5f96bb6d0630332459da4a3b3ed636ce984d42e8c46cdfd210571443ab9adf1c9c1694da8d1cb4f5654791133f3df5605371 SHA512 cd71131d24ff78b0cbb8bf039dde1e24d206e91787782bf6e2e23d9f8028188ea0fd675eff630a9372f3199b88445048de4db42242f06343e19a6a33bd7d71a2
 EBUILD lmms-9999.ebuild 2312 BLAKE2B 4ff386189219b087a28849b5eaa9821705b9e58497206a0e1d29ed4d2a67893b222562ad36e85c6e62569c1689efe7d10c0bd01cf3a6cf118ed9526e90b871ae SHA512 e2880190ea5731e948b72b4a1f2d06f6992486f7e0d3b7a521d2723b070e611143d686b37fe43f110b52cdf40a16f9a08fb6938915b80cd27b256ad7869894db
 MISC metadata.xml 956 BLAKE2B 0146d8de32c1f9aaa1b111f10e48de20bde5e3634527b4da37ec14d2a148e6eb974bf6665e4fe6254732dff28ec24e3ca7fd1d7b860928453a223bd183895715 SHA512 d96540b061f24e031f1cbb381c05f4eb368e207f8300e8b68e57a36deb2bfb6108453e8428e2534e895927a738d74d8692fc918d8456e0f01b5ec971d4400acc
diff --git a/media-sound/lmms/lmms-1.2.0.ebuild b/media-sound/lmms/lmms-1.2.0.ebuild
new file mode 100644
index 000000000000..d5f82bfff2a3
--- /dev/null
+++ b/media-sound/lmms/lmms-1.2.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# The order is important here! Both, cmake-utils and xdg define src_prepare.
+# We need the one from cmake-utils
+inherit xdg cmake-utils
+
+DESCRIPTION="Cross-platform music production software"
+HOMEPAGE="https://lmms.io"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz -> ${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+
+IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk vst"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=media-libs/libsamplerate-0.1.8
+	>=media-libs/libsndfile-1.0.11
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	>=x11-libs/fltk-1.3.0_rc3:1
+	alsa? ( media-libs/alsa-lib )
+	fluidsynth? ( media-sound/fluidsynth )
+	jack? ( virtual/jack )
+	libgig? ( media-libs/libgig )
+	mp3? ( media-sound/lame )
+	ogg? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? (
+		media-libs/libsdl
+		>=media-libs/sdl-sound-1.0.1
+	)
+	soundio? ( media-libs/libsoundio )
+	stk? ( media-libs/stk )
+	vst? ( virtual/wine )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtx11extras:5
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/ladspa-cmt
+	media-plugins/calf
+	media-plugins/caps-plugins
+	media-plugins/swh-plugins
+	media-plugins/tap-plugins
+"
+
+DOCS=( README.md doc/AUTHORS )
+
+src_configure() {
+	local mycmakeargs+=(
+		-DUSE_WERROR=FALSE
+		-DWANT_CAPS=FALSE
+		-DWANT_TAP=FALSE
+		-DWANT_SWH=FALSE
+		-DWANT_CMT=FALSE
+		-DWANT_CALF=FALSE
+		-DWANT_QT5=TRUE
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_JACK=$(usex jack)
+		-DWANT_GIG=$(usex libgig)
+		-DWANT_MP3LAME=$(usex mp3)
+		-DWANT_OGGVORBIS=$(usex ogg)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_SDL=$(usex sdl)
+		-DWANT_SOUNDIO=$(usex soundio)
+		-DWANT_STK=$(usex stk)
+		-DWANT_VST=$(usex vst)
+		-DWANT_SF2=$(usex fluidsynth)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 8cd22eca7dcc..2edaffbe9570 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,6 +1,3 @@
-AUX ncmpc-0.33-mandir.patch 884 BLAKE2B efe04cbaecc0c44511f9a4e9eb0bcc29da1ab53a72418cadfcf467ffe13490e243e05d268cddb7aea6150033df03bb01f2b49ecfee5854eaaa776f15d2e1259d SHA512 ca6afc19c2bf900abb770ed915ed8dd583bb0ad04d29291796f8b7bf083d6de1fecac2168aa0ca72413534ce74bf598132521c5b9c59c6aace51c20598935b23
-DIST ncmpc-0.33.tar.xz 226344 BLAKE2B d52fdcb17adda1d3d61645715029552804edbf8ed95d2f19e0a25ba11f66cf0e7921748aebceb63e8e32b8d31fbc2d387dfbed6bd5c6a735d5ffa4b17d9b4fa3 SHA512 47730003c9a8ad5b6e682de4b4d3c8882d3266659fcd73ea131d1bba3d6b4d9ac66bb1a3522d63cb238ca9e22d8035907b9d7621a0b5106763770b17325f53b9
 DIST ncmpc-0.34.tar.xz 227892 BLAKE2B 19d9d9abe3d85cb2567a222c8ce108889d4517272e2bb82f4064ef76af68d610ff4c7516102b976f66380e0e3d3ee7ed00023116cb6b2d1628e3d38796705a09 SHA512 e206cc2d61799a97edf1182de4cee1c0fa447bd1fac136dc48670cb624a7efc903c693b0c541fbc00fcb94e055c83be1ca6370386c99131a1b571f47b67c35f4
-EBUILD ncmpc-0.33-r1.ebuild 2070 BLAKE2B e33419a69883824503a54b47a52d95a9f1ffe2ebe7f5c70fa457918198072d90305366236a8dea0c1b9ccbcb738273366aed8830c8e3d3c89c42b350003b140f SHA512 b9f8c0220bcee0a2b6e7deee2960b350b086eeae8a3dc6d1fcbb50790447a7b3fc4754f6e92d9c153ba4beaf4e95044f0043001cd83080afe55d47fd65d05894
-EBUILD ncmpc-0.34.ebuild 2029 BLAKE2B 55343ff919bf9bea000d6a82f6e8f4331bb40756269b80e751f5229025deff346cfafdce20697b12b0a77baa8b718a409943e3ac3580d55208baad5178d95144 SHA512 f09cb501e27d1e6d0c054af77f47e6dd8a650b9727ba195db9ffd84f3f7dd4ea5338641c793b6cad9aff01efcb2fae8c537bfe5963b47cc973f8b5101b1901fb
+EBUILD ncmpc-0.34.ebuild 2025 BLAKE2B 47179d220da464802c3f9691d9fc3f88a89ce920acffd9fc12b33dba67e109cc092e06aa23ab2e0d4af5fcadcfb3abab89da68fa596391d29b59399dc6fd6c7e SHA512 0c5e498d359add5c95a65b2a47eb690be1d3eab989c913e073e5998bf683a3864a70034b599b24c0e5e0a510c7b349efe88490c3b1872a339597fc8fdfa09c8b
 MISC metadata.xml 947 BLAKE2B de28ab3a9263d21b8a2727fb80a70467d4c086c18712bcc6ee51c434f512a7daab42832728a150a677a4552f36950038e08076fd2c1eaf0ec5c2f7e82408efed SHA512 19a555b3375402a4ff9931e2d1c17bb3146d963f3c4665216e9e63deb61b99313267eb9e3815aa9f6d3f4dabee1734131b9ee71ff41562b7e9aa881fe10b1760
diff --git a/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch b/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch
deleted file mode 100644
index 0bc3798bc5e7..000000000000
--- a/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 821acdad907d1558c570bca6e2ac63d55905f363 Mon Sep 17 00:00:00 2001
-From: kaliko <kaliko@azylum.org>
-Date: Mon, 10 Dec 2018 13:46:42 +0100
-Subject: [PATCH] Fixed manual install dir
-
----
- doc/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/meson.build b/doc/meson.build
-index aadea58..f4b491d 100644
---- a/doc/meson.build
-+++ b/doc/meson.build
-@@ -30,9 +30,9 @@ endif
- if get_option('manual')
-   custom_target(
-     'Manpage documentation',
--    output: 'man',
-+    output: 'man1',
-     input: ['index.rst', 'conf.py'],
--    command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
-+    command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@'],
-     build_by_default: true,
-     install: true,
-     install_dir: get_option('mandir'),
diff --git a/media-sound/ncmpc/ncmpc-0.33-r1.ebuild b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
deleted file mode 100644
index 2746f5e2c156..000000000000
--- a/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-RDEPEND="
-	>=media-libs/libmpdclient-2.9
-	sys-libs/ncurses:0=[unicode]
-	lirc? ( app-misc/lirc )
-	pcre? ( dev-libs/libpcre )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.62
-"
-
-PATCHES=( "${FILESDIR}/${P}-mandir.patch" )
-
-src_prepare() {
-	default
-
-	# use correct docdir and don't install license file
-	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
-		-e "s/'COPYING', //" \
-		-i meson.build || die
-
-	# use correct (html) docdir
-	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
-		-i doc/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcurses=ncursesw
-		-Dcolors=true
-		-Dmini=false
-		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
-		-Dasync_connect=$(usex async-connect true false)
-		-Dchat_screen=$(usex chat-screen true false)
-		-Ddocumentation=$(usex doc enabled disabled)
-		-Dhelp_screen=$(usex help-screen true false)
-		-Dkey_screen=$(usex key-screen true false)
-		-Dlibrary_screen=$(usex library-screen true false)
-		-Dlirc=$(usex lirc enabled disabled)
-		-Dlocale=$(usex nls enabled disabled)
-		-Dlyrics_screen=$(usex lyrics-screen true false)
-		-Dmouse=$(usex mouse enabled disabled)
-		-Dmultibyte=$(usex nls true false)
-		-Dnls=$(usex nls enabled disabled)
-		-Doutputs_screen=$(usex outputs-screen true false)
-		-Dregex=$(usex pcre enabled disabled)
-		-Dsearch_screen=$(usex search-screen true false)
-		-Dsong_screen=$(usex song-screen true false)
-	)
-
-	meson_src_configure
-}
diff --git a/media-sound/ncmpc/ncmpc-0.34.ebuild b/media-sound/ncmpc/ncmpc-0.34.ebuild
index fdb5a17612dc..61366c96ff3c 100644
--- a/media-sound/ncmpc/ncmpc-0.34.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.34.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
 
 BDEPEND="
diff --git a/media-sound/pamix/Manifest b/media-sound/pamix/Manifest
index 6d4ea6a86270..20443cc9973d 100644
--- a/media-sound/pamix/Manifest
+++ b/media-sound/pamix/Manifest
@@ -2,6 +2,6 @@ AUX pamix-1.6-ncurses_pkgconfig.patch 1022 BLAKE2B f5ffa8a58e49fb8bf7c14c1764ddd
 DIST pamix-1.5.tar.gz 16902 BLAKE2B 4f7612cb870f84110b8cc31a061afecb7c2aeb8d073887cde671bbaf8702db83b8cfe4e7b06e9260c6925c4334c1cb46175612f87d4ed625181179f615b6e954 SHA512 51516664c5f5d8d0c70565c5cdd7a91e7d40c83a49d75ca76c38286d937a737da28f9070e9d0185545d8e74999894e3afa9f1d2f8c22658f83af5c1c161f7938
 DIST pamix-1.6.tar.gz 18552 BLAKE2B 35cc2844cf0d5824c961a226f1b857b3ac070dc5c4fc802a9aa21a3317f9afdc42fb87e18d9e9a61276ace66a93d42c256e7811e946e3f9fba19f645ab8f07ef SHA512 53f3a892b41418cdbfff28d29636997e777ab9e1042f002e1df47735941e5a34f0391866939c539594d22f0b3f0cbd1ad5342dc5663d816e12354ae9e744d5f8
 EBUILD pamix-1.5.ebuild 773 BLAKE2B 57ab9145fcb6998a9c03ae50109cb9a65dbdae0e2a7578dfdf8f3287deea336948774c37059bf4f6ae39cee5e71d66c1827eb0c09b6adf0c1377a9915be79865 SHA512 4041efab6a1ee3d34d39a8dfd2f4353516eec4dcb937d334c6e7113700a9ceb3cb82b8f29a834093732c9b97f37f92509313eefd38ecbe0cfbd779f9e90a963d
-EBUILD pamix-1.6.ebuild 850 BLAKE2B 845af8b7c774e977b9bebb96d83dd6dda7463c5a1f388bdb22283d8ed4a7a35e2da62a0eca3f1fe539158a9e8f54cafc13754e39a1a48490a5de1f05f2e1770a SHA512 ab2020f427bb9175b282ed59611de4b291372617afdc6d4c5b4106a593ee123d2673aba34e16e42aebce9da25be8b4adcc0f26842309474a5f36471e4220544c
-EBUILD pamix-9999.ebuild 794 BLAKE2B d0bbf1bb4375d6bbd7d50fcd344dd9175a3ea4519f85a328cfdfa4a233aee5c83723b7584b7ff8263f88f59370d7a2c2d30748123fc1d54e94c6efab98cb7dcd SHA512 c098a7473d9f3852a66a04d395cea32ac9a528ae6031e503f53db4487c952157fb26f17a4623c5cc0280d43ceea8d0a8ed9031600e1c41f05eed85f1fde7d212
+EBUILD pamix-1.6.ebuild 845 BLAKE2B 177ff961b13d3008f5a45ad81aac87ed31e256e4114a07a3402e88034424c8c72295a41422ef8fd9d956a6f652a8466a785b4bed54dfec9dc6b1e6f442bbad42 SHA512 e063b58c9bd13b3640cd29aa2d5f3d9eed262a031aaf791b96aac88d9847836ad42509043fdf1489d9ae1348a98bd07ef06181d324636724e3bfa237bc5671b2
+EBUILD pamix-9999.ebuild 765 BLAKE2B 8526b7d2c78f6fc7435fc9618cb1f5642f907e3f44d3f6e35a88f9d87de250e150331a701aaf1a8da438e714e231903d44eaf479a82df1a3d51ce6e028c20857 SHA512 8ae303675cd3cb93c994b637f349d6b94b7d3bcefc7220ad938acef4cbd34c7505143f39b0d2d19439795faf6c8b9328f9fa79492cfaac23c6ce3e4d805e6cc0
 MISC metadata.xml 341 BLAKE2B 370b3031b7775e1c96f7d275f0e662594ff091d5d621dd51548af9153ec7a40eb821055573d6b53a742b1ee777b72067c49d900a6dec47b8f7bce09457e89f3b SHA512 8ca39f3e12bac0db8cd11f2ef8707d06fe1008f265bc99b0757650e98d4c2e36c4693cc46c7e657b26f7737e29479ac64a22e305171072bbbc74ab48ea67b5cf
diff --git a/media-sound/pamix/pamix-1.6.ebuild b/media-sound/pamix/pamix-1.6.ebuild
index dbeb0e57cc75..f77264e2b207 100644
--- a/media-sound/pamix/pamix-1.6.ebuild
+++ b/media-sound/pamix/pamix-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
 else
 	SRC_URI="https://github.com/patroclos/PAmix/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/PAmix-${PV}"
 fi
 
diff --git a/media-sound/pamix/pamix-9999.ebuild b/media-sound/pamix/pamix-9999.ebuild
index a3da8fcc45fe..b4f4397507df 100644
--- a/media-sound/pamix/pamix-9999.ebuild
+++ b/media-sound/pamix/pamix-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-SCM=""
-[[ "${PV}" == 9999 ]] && SCM="git-r3"
-inherit cmake-utils ${SCM}
-unset SCM
+inherit cmake-utils
+
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+fi
 
 DESCRIPTION="A PulseAudio NCurses mixer"
 HOMEPAGE="https://github.com/patroclos/PAmix"
@@ -24,9 +25,10 @@ fi
 
 RDEPEND="media-sound/pulseaudio
 	sys-libs/ncurses:0=[unicode?]"
-DEPEND="sys-devel/autoconf-archive
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	${RDEPEND}"
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index 4e76de0083cf..b4e3bcf77fbf 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -1,13 +1,5 @@
-AUX playerctl-0.6.1-doc-typesfile-path-fix.patch 1127 BLAKE2B d41f347717cbd49fb9ba1792fc33f9777e7a43ddc88a5678dc94666cf4b14a03467b270cd333329c41535f72cd3d075210e8bcca84ff9d6b41791e111eb198fc SHA512 24694c8172e59b2eb76f72e4bb1ce8809ab9ce0b335875750e189ba0047d7282e824f993495feea5680a53afc668cf313a50c1f00ff878512e52260c534248d5
-AUX playerctl-gdbus-codegen-fix.patch 516 BLAKE2B f83b6f8780553aa1c49240d2724f5b88a47246c2c80d652face89ddc9b5effc4ee009b00f2d8fea52db173ebeb77b036b20eed0b0cd29d76c4515d06888c09f4 SHA512 d943c238fe15f003bbe798e8eb9340f5277d745414b258b8e124d7fdf186d7708e341bd8c24783c32d18faea63784881f082ee1d365779cb36c88e4c1c076cf4
-DIST playerctl-0.5.0.tar.gz 17015 BLAKE2B 5da1d0fd4e442ac5f124bd693ae14222624c5239c9fad72e57d43977467339522344bc8d8c37b0f2bfda51c61861dc33d7e35e4a730ce59a87b691b5657ec729 SHA512 307cad5eeea7efa0c97c885660f49468f442fe907ef2495b56ac512e0551c7248750897b6d00934cbfcfcb35f486a101a238b276ef71d2ef866132ca3cc0932c
-DIST playerctl-0.6.0.tar.gz 22124 BLAKE2B 6bb90586c56e21a00b5e6e1769248b9782a8211b01dacf590857fe4fe199d6d3fa7aa46a36cba9a8e198a1aad0bf17973fc15140db11c484edfb0275971d3d08 SHA512 8023b5704ca2a428510df6228850b616061289764cc3c4190c0c46f79d6a20e499495f2d773bd821357653ba63bca40eac70f7cc3a11251da3c6a4f7781db739
-DIST playerctl-0.6.1.tar.gz 22921 BLAKE2B d2f5874280e1a99b318bc83c40a38ee31d9c68426cb63e1e16e8ded26bac1a894d78a929f46d45d631af70e37476a4151c520eb69c94e80026689a12c682f0ad SHA512 07c302eb06a96bf3b8aa180e68e85ef6f9fdb5933b80fbce8ee5f9a36c1d961eaf5638e319ff0b26475984acc57a447a4aa8e705667f77e4bd393364cdbfb284
 DIST playerctl-2.0.1.tar.gz 43700 BLAKE2B 9df01bdb5f71a589a40462ed807b0f150d8c90921d1e0ef96bf99f20d9e58345307af35b39cc95e8ab37fcf9e5686935d856e050b61210188008b65281e63557 SHA512 6a5807abc79358bab0ad30a11897a8109121d5eb7d9e17d2c695221ef83942c3c7235fc738ab27c9dd2d3364c04737355e9c88ec5d49f999565565fb4494f720
 DIST playerctl-2.0.2.tar.gz 44241 BLAKE2B 3a1d5f59fdb0067f1147f4ef95990ae0755a372469c0f03491b4f3aec8d0cf754bb4d3057063211ee810532967ace0d35fa6a7f3f8cee8d7a5c09031cb5b11c9 SHA512 ad588f81d42c8000ccd2d2dedacfcd82887a958189b354ad6285545f7ed59e885febe0c3f9e3da915ae0fd0af4bfb4cefda54f17f0560fc4c00b1be6e92f3ac0
-EBUILD playerctl-0.5.0.ebuild 961 BLAKE2B c5e9a31ab6029fda37f90048bfefbd427597f415029c7b21a8d06ca28e93a0adc52086378ac4d4d92e231ac2ca6f60f28c2cf901a863d323fa798880d5a7b63c SHA512 a8c736778a09c63d1b9590e690475287b63dc4578c114ac4f5920ceb36842aade3ddc935fb1ee05830549a99ddfa17c5051c06c14ae4d634ce4342817ab950d3
-EBUILD playerctl-0.6.0.ebuild 971 BLAKE2B eb0815e604aa2907e30973cc247af604f4fe896791db2531bd3bce6ca019a0353a4aa1f0dfad74b1102c4b0ce9f2d75d22f40ae924ca712220a95c56f2cef466 SHA512 7aef5362b82114a3b9ea8885610fff9b382ed26609cba7d68f6dd28c56b0f12dc1b6082daa351202993dc9bfdfd317803823fc597ce47a6941f6941a5e6b9c3a
-EBUILD playerctl-0.6.1.ebuild 973 BLAKE2B a6f3a4432d1b42984a3426977b05f4e94b303afc755a061f121196e882704cf440c8606b9829099ff91d3e01653ecf75e2beee121b9d0683c6e3c4c0c1b8032c SHA512 0c57ffda7cedd332b10cc566967f35c9a89b0cf732025fe9b4febedb89801332b7a357fb281520dfeee668ae1cea95b1d9c26e9a5cde6fdf0536bdbe9f355d5e
 EBUILD playerctl-2.0.1.ebuild 1053 BLAKE2B 2d5414790ca1e1745e6c86bf2524718c37c843c162050f688072ca9385d23054fb63494a9ac41fb89579eb5b28717650186f70b2ff10cdf0093b52c26dc0aa0f SHA512 d2b1bd2e41f60fb5c61923ec8088986ac5acd695462a5d4dd7be6b7689792072e8846de0da4071c26bb00add72e19f33ee063302760a26547948f4ce7782a84d
-EBUILD playerctl-2.0.2.ebuild 895 BLAKE2B 2c298cbd020cf05b0f6501cd0516e2164bbcc3cf7f2b65a263a992e7af8a27bebef341dd4e24eecb879a3ebd9b96ffa8017b62542e0c62e0764233b8ed0e2cdd SHA512 6c1e0442d8913e2601da8a0257a76d51f3587b53b345b3051973d295970bb974fda5e358f048537e51dc14e99350c435382b4a330e1819f2cd4acd1abaa5907c
+EBUILD playerctl-2.0.2.ebuild 893 BLAKE2B 4c7298c6c3bd2ea410d2806014a53ca5d116cef4d816d347629ae7a9626a7f39a3bd6b9f2968e4aa15d6f9d86c209c8867e27237a198693a7a9481e3850766cd SHA512 861dd884b243df3975481e2b45e995f8db602705b9ba2be1e01a121cd8bbd0304af39ffe28aa8a6d9651256121b24e9583fd26bc3429b616edc09e67ab75c1e7
 MISC metadata.xml 487 BLAKE2B 26a06ce93634d362dee7b3a595d5257ef946c27a17c181f758fa3c0acd33aeb45c825643311da3739791f80402e38b8fd618ea43655ec60689978cf2e0f2f30f SHA512 f97cd3597a70b86c784f11ffcc5c7c8fb5c16a124cb871907f8e3f216b7ff26d7e2954a52f52a5640fc8a8f41300a4419c527c57f410350a322ed36b1fa2e77f
diff --git a/media-sound/playerctl/files/playerctl-0.6.1-doc-typesfile-path-fix.patch b/media-sound/playerctl/files/playerctl-0.6.1-doc-typesfile-path-fix.patch
deleted file mode 100644
index 75ba5b61f9f1..000000000000
--- a/media-sound/playerctl/files/playerctl-0.6.1-doc-typesfile-path-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f5fefa32f1ac59d2a9c00221281fe3541845d6d2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
-Date: Mon, 16 Jul 2018 18:21:21 -0400
-Subject: [PATCH] doc: look for gobject_typesfile in build dir
-
-Looking for playerctl.types file in the source directory is a mistake
-because it's generated during build and placed in build dir. Look for
-the types file in build dir instead.
----
- doc/reference/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/reference/meson.build b/doc/reference/meson.build
-index 100d561..b5a16a7 100644
---- a/doc/reference/meson.build
-+++ b/doc/reference/meson.build
-@@ -19,7 +19,7 @@ gnome.gtkdoc(
-     '--name-space=meson.project_name()',
-   ],
-   scan_args: '--deprecated-guards="PLAYERCTL_DISABLE_DEPRECATED"',
--  gobject_typesfile: meson.project_name() + '.types',
-+  gobject_typesfile: join_paths(meson.current_build_dir(), meson.project_name() + '.types'),
-   fixxref_args: [
-     '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
-     '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
--- 
-2.17.0
-
diff --git a/media-sound/playerctl/files/playerctl-gdbus-codegen-fix.patch b/media-sound/playerctl/files/playerctl-gdbus-codegen-fix.patch
deleted file mode 100644
index 06c073aa2761..000000000000
--- a/media-sound/playerctl/files/playerctl-gdbus-codegen-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -21,10 +21,11 @@
- PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.38])
- PKG_CHECK_MODULES([GIO], [gio-unix-2.0])
- 
--AC_PATH_PROG([GDBUS_CODEGEN], [`$PKG_CONFIG --variable=gdbus_codegen gio-2.0`])
-+GDBUS_CODEGEN=`$PKG_CONFIG --variable=gdbus_codegen gio-2.0`
- if test -z "$GDBUS_CODEGEN"; then
-     AC_MSG_ERROR([*** gdbus-codegen is required to build playerctl])
- fi
-+AC_SUBST(GDBUS_CODEGEN)
- 
- # Checks for typedefs, structures, and compiler characteristics
- AC_PROG_CC_STDC
diff --git a/media-sound/playerctl/playerctl-0.5.0.ebuild b/media-sound/playerctl/playerctl-0.5.0.ebuild
deleted file mode 100644
index 0a05e650f208..000000000000
--- a/media-sound/playerctl/playerctl-0.5.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools xdg-utils
-
-DESCRIPTION="A CLI utility to control media players over MPRIS"
-HOMEPAGE="https://github.com/acrisci/playerctl"
-SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if ! use doc; then
-		echo 'EXTRA_DIST = ' > gtk-doc.make || die
-	fi
-
-	eapply "${FILESDIR}"/"${PN}"-gdbus-codegen-fix.patch
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	xdg_environment_reset # 596166
-
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-html)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-sound/playerctl/playerctl-0.6.0.ebuild b/media-sound/playerctl/playerctl-0.6.0.ebuild
deleted file mode 100644
index 4effb5f74a60..000000000000
--- a/media-sound/playerctl/playerctl-0.6.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools xdg-utils
-
-DESCRIPTION="A CLI utility to control media players over MPRIS"
-HOMEPAGE="https://github.com/acrisci/playerctl"
-SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if ! use doc; then
-		echo 'EXTRA_DIST = ' > gtk-doc.make || die
-	fi
-
-	eapply "${FILESDIR}"/"${PN}"-gdbus-codegen-fix.patch
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	xdg_environment_reset # 596166
-
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-html)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-sound/playerctl/playerctl-0.6.1.ebuild b/media-sound/playerctl/playerctl-0.6.1.ebuild
deleted file mode 100644
index 262d4ae14ff6..000000000000
--- a/media-sound/playerctl/playerctl-0.6.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson xdg-utils
-
-DESCRIPTION="A CLI utility to control media players over MPRIS"
-HOMEPAGE="https://github.com/acrisci/playerctl"
-SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc introspection"
-
-RDEPEND="
-	dev-libs/glib:2
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-# Override the meson dependency in MESON_DEPEND of meson.eclass
-# The eclass depends on '>=dev-util/meson-0.40.0' as of writing this
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/meson-0.46.0
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.1-doc-typesfile-path-fix.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc gtk-doc)
-		$(meson_use introspection)
-	)
-
-	xdg_environment_reset # 596166
-	meson_src_configure
-}
diff --git a/media-sound/playerctl/playerctl-2.0.2.ebuild b/media-sound/playerctl/playerctl-2.0.2.ebuild
index 6f909ea8d41b..4a6d3b7aa9fa 100644
--- a/media-sound/playerctl/playerctl-2.0.2.ebuild
+++ b/media-sound/playerctl/playerctl-2.0.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/acrisci/playerctl"
 SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc introspection"
 
 RDEPEND="
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index c30654a8c998..b540541655b7 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -5,5 +5,5 @@ DIST rplay_3.3.2-12.diff.gz 25322 BLAKE2B dc66fd94076e7ac3ffe863db98b326ce0272bd
 DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
 EBUILD rplay-3.3.2-r1.ebuild 972 BLAKE2B 894346d8cdc7ea39a3f7e69e92b3a3645df8848699be6258518b2b1a28e1605e1a9febf8cd7384003dbde0dcdfe799ec8e8cabc3781316e5e09203a7fbf13762 SHA512 d9dc52fe82472426e6d8217003fd0d46bf4dc4af7b57fb67b7356821b39604be10a5429973606b62e0949c60b030df2e5ff99e9c0249e53d27ec962a5f0d5bfd
 EBUILD rplay-3.3.2-r2.ebuild 1125 BLAKE2B 24522fbbbcbb42cda98f1692853708beef98a42fc50f998aeae58bd8234bdff1f75fa34fef2412e71044bbbbb3d4b8275416c110694a5bb1c3ec6b2427d2cc40 SHA512 8b949b1f97bf29b94cc9eac103a1cb365bee26da8f3dd91f2c6ac187cf0254366e36bf062d95fe0cef79dee0f3797faee54342430ecd3719c6e3c22fceb73785
-EBUILD rplay-3.3.2-r3.ebuild 1211 BLAKE2B 05288821d87accc586edcfdf7aab14410beae3899bdf76a099f13a83d94ae27983ff1817298928f585f24cda7b8df99869a1a69c3fd8845ea264d8fd6a47c6cf SHA512 daaf85de722d2c2932a6d7dd988bb5d50fd8231f2cb19ce70366ac69b2fdbe66d2a9487df6e1df794ada117270231582dbd3405d27da200733060e6b7f7e7647
+EBUILD rplay-3.3.2-r3.ebuild 1210 BLAKE2B b86e1c43c951e628442ba6bc9b1c423b4b33fa78d0a212bfdac4d2fdcaf2589f3c86a92826e0f6cfc58c0cac2450b57b6bb2fc3062b8895f9b994d6d0877c964 SHA512 bcf58c67e86d81075e65cb82f77a51a0f49616e2104205e9ac1ad2d1db33ed9436250c760421ab41b567e88ae1f3eb79d1941892b5b4befc353d0d8c08749425
 MISC metadata.xml 602 BLAKE2B 12db89459ab4cc0696d1c6ede006c6f0365854801e2a67ae060fe0a807fc8021d5d4c0b992ee1adc21951bba7aaf5734aa7c4742feff563d8b009322f58cc5d7 SHA512 2133c5096ee010c0470667238f9d600c4617b9659615b3302abd81eb7b4b84107cfe9efa2070d5536d91aa11a90be1865703cdd5f92d0ea1f8718336a65cb272
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r3.ebuild
index 6302124d1878..b5865997d91b 100644
--- a/media-sound/rplay/rplay-3.3.2-r3.ebuild
+++ b/media-sound/rplay/rplay-3.3.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-sound/gsm"
diff --git a/media-sound/split2flac/Manifest b/media-sound/split2flac/Manifest
index 0e7ee093bccb..3934f2c13147 100644
--- a/media-sound/split2flac/Manifest
+++ b/media-sound/split2flac/Manifest
@@ -1,4 +1,4 @@
 DIST split2flac-122.tar.gz 9468 BLAKE2B 605001d92b3de52def98db28aeaba8a48c9c4ac5d621d27cbd7637d337f18acb50ca33f46b898def94d8259ae97c5cae534334df6ed5f6ccf267103a9023da36 SHA512 3be5d8f5a55107a6230108bb49b422303504a1b16ebf458759122b27effb492353f92f95c00bcfa52b45fad24a4e08fa638df9922288bc2844e3a971d3734ed8
-EBUILD split2flac-122.ebuild 1343 BLAKE2B bbe540f2e48f0328093f7ced967503d78506dfd81e922b92beebd145dc124bfde4f9a5b00749c36236ce343f1f0ff853ea134de45a9e9f2c1f869b85045f4b82 SHA512 98b00280462ee540979541c459ea39a5983793526677a3f90ea7e890d2d6e0cfea1ab22beb9fb263e812ccfaae3cd0702b5ff2232d3931248a3b8193c19b9696
-EBUILD split2flac-9999.ebuild 1323 BLAKE2B f21a79760e5a73e64fd07e87dce447b3861a05aae9a209573e505fce450714b77d49a8d24badbfb3b7529c2d5c4fd624da8817e9adbd198706569c7ce9fd837d SHA512 493314c27d28666409d346afac45aaa8539726845e45a256fd558e4502ed7073469e9681376224e2bf38db338290b3c4194dced60cea938b635e2633b0f90d83
+EBUILD split2flac-122.ebuild 1280 BLAKE2B a9769d5f7fedbc072d8e316050ab345d0b008537b80df9f87a24010446a572d86f8d7cb09fd57315fe5cda852dc66fa9e256b0596d7f0a7fd673e354e54b99bc SHA512 111b6b069d1a6c5beed470589790fa98c4fa8684db186733938f6471150fcb2e30529a36945e51f079ca11b64c89f7d4e5de202740d5bb9213fe2f5a1e008cdb
+EBUILD split2flac-9999.ebuild 1282 BLAKE2B 06990f52afcb1dcbd91f5d4d5f06081b1ab2edb471f8d146601ce3c28f5c61c05c5d6536df7f547d3f2f2ef8c971db0de87f47754cc9c9ac8b05721df74a4f0b SHA512 ba213ef0f4865be582114ae7731d1e8d684ea87d5060b72e2f3fd1eb65878ddbb72f0be12957c9ba39359392ddcc9b5c7e385ace63b2a2e962445df6461d1e33
 MISC metadata.xml 1246 BLAKE2B 7a2df038b155c1dfefbfbc3897409de32e21b0e32e543e1c4d5cce58e6d5fbefd5b341b53fad2d81c0e5a114953be7462ad736dd2206f8a3ef6113b076ab2d3c SHA512 ee36cd39bb98e817542a6292f70e8867508eaae58e4b6a14fd1874bbeb8f21422385d07cfb1f9280852c40b3cdf87a1cde895fb327230e93a5c67a2e8f478cf4
diff --git a/media-sound/split2flac/split2flac-122.ebuild b/media-sound/split2flac/split2flac-122.ebuild
index b93363779abc..90ea1c6a5fd4 100644
--- a/media-sound/split2flac/split2flac-122.ebuild
+++ b/media-sound/split2flac/split2flac-122.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-EGIT_REPO_URI="https://github.com/ftrvxmtrx/split2flac.git"
+EAPI=7
 
 inherit bash-completion-r1
-[[ ${PV} == *9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ftrvxmtrx/split2flac.git"
+else
+	SRC_URI="https://github.com/ftrvxmtrx/split2flac/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
 
 DESCRIPTION="sh script to split an APE/FLAC/WV/WAV audio image with CUE sheet into tracks"
 HOMEPAGE="https://github.com/ftrvxmtrx/split2flac"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://github.com/ftrvxmtrx/split2flac/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 x86"
 IUSE="enca flake imagemagick mac mp3 mp4 ogg replaygain wavpack"
 
 RDEPEND="
@@ -34,20 +35,18 @@ RDEPEND="
 		mp3? ( media-sound/mp3gain )
 		ogg? ( media-sound/vorbisgain )
 	)
-	imagemagick? ( media-gfx/imagemagick )
-"
-
-src_configure() { :; }
-
-src_compile() { :; }
+	imagemagick? ( media-gfx/imagemagick )"
 
 src_install() {
 	dobin ${PN}
 	newbashcomp ${PN}-bash-completion.sh ${PN}
 
 	dosym ${PN} /usr/bin/split2wav
-	for i in mp3 mp4 ogg
-	do
+
+	local i
+	for i in mp3 mp4 ogg; do
 		use $i && dosym ${PN} /usr/bin/split2${i/mp4/m4a}
 	done
+
+	einstalldocs
 }
diff --git a/media-sound/split2flac/split2flac-9999.ebuild b/media-sound/split2flac/split2flac-9999.ebuild
index fd0a7bea8998..762b68edc498 100644
--- a/media-sound/split2flac/split2flac-9999.ebuild
+++ b/media-sound/split2flac/split2flac-9999.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-EGIT_REPO_URI="https://github.com/ftrvxmtrx/split2flac.git"
+EAPI=7
 
 inherit bash-completion-r1
-[[ ${PV} == *9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ftrvxmtrx/split2flac.git"
+else
+	SRC_URI="https://github.com/ftrvxmtrx/split2flac/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="sh script to split an APE/FLAC/WV/WAV audio image with CUE sheet into tracks"
 HOMEPAGE="https://github.com/ftrvxmtrx/split2flac"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://rion-overlay.googlecode.com/files/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86"
 IUSE="enca flake imagemagick mac mp3 mp4 ogg replaygain wavpack"
 
 RDEPEND="
@@ -34,20 +35,18 @@ RDEPEND="
 		mp3? ( media-sound/mp3gain )
 		ogg? ( media-sound/vorbisgain )
 	)
-	imagemagick? ( media-gfx/imagemagick )
-"
-
-src_configure() { :; }
-
-src_compile() { :; }
+	imagemagick? ( media-gfx/imagemagick )"
 
 src_install() {
 	dobin ${PN}
 	newbashcomp ${PN}-bash-completion.sh ${PN}
 
 	dosym ${PN} /usr/bin/split2wav
-	for i in mp3 mp4 ogg
-	do
+
+	local i
+	for i in mp3 mp4 ogg; do
 		use $i && dosym ${PN} /usr/bin/split2${i/mp4/m4a}
 	done
+
+	einstalldocs
 }
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index e04eeb7a975b..e851049840ab 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,7 +1,5 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
-DIST spotify-client_1.0.98.78.gb45d2a6b-10_amd64.deb 105135826 BLAKE2B e1641a738f8e03c86d9b28ac902ed9857e1bb406b03e7a1c59c522e86a211b13cfd442bf84f79af4302d32a4b1c041e8ef7297990e70912d8c0a5108838e0500 SHA512 f20f2c998a205f189a19f332b2e738a0ec98a34520765c0e1d27d95d92f7c9c2f78da32f9edcc61146be87e8d8df7d3521d2e84b427cd25586b9fe6bec8d1602
 DIST spotify-client_1.1.5.153.gf614956d-16_amd64.deb 113728674 BLAKE2B bc7930a1935c0a05dba262abc384a699720be53e3bec83393c962761bee647a247d2ddf475a6812bdb969fc1f59e9d2c283de0da398a9b8f7ddfff8f1232fef1 SHA512 db354f161c35b5f1a2d633282fad8fccf565e0061e7d258012f28422d766630391d47d4dafe22448fb60f850bf4ccbfdf82443cf107e03727c077b2c62e524be
 EBUILD spotify-1.0.72-r1.ebuild 3204 BLAKE2B 8844b7707b35537320da75bd7417c320559abbc668249cc652e9e2d481cfc9a00328458a8ee8c242acc46e832a81127686f0a3bb93ee6d4e4cc2e9e24f8c18d7 SHA512 8f194869be7f6aa8a9330d8597e8a4419a19203f4dbe387de1aeeda9350de13e4596a01290ed452c358d72fc8e20e249b4fcbf17a1f38a688315e0c189e0cc4c
-EBUILD spotify-1.0.98.ebuild 3429 BLAKE2B 436b23f7857907ba883d7ade7eedfe1ecbfe15f2b2f787c1a832bc4d888c13aa5098b9a495f38c200795775476501465d6fb63e39e1b0cbf5e6da9093ee76c48 SHA512 9f431988b6adf74319efce9aee404684bf495604db5d5b1a0cfa241c43cd026e4646bfc19ad1d66572bf451423be832761750ebfda1a43b10d50f283b37d70f2
 EBUILD spotify-1.1.5-r1.ebuild 3139 BLAKE2B 1ee1b89ab15fcbdc964636cdcb2630d72ed1b6a4830761c98465686aa9a06e09659dca2a1afd5b0f6f4f65e3e7a6fa4ee9613b78232bf34b4109ba5480c94664 SHA512 412165d9e270d0a3a1ebf0338a307e0fdc6a22d760aeefb46427dcbb3b9dcc906d9be40bdeed986588a9096bdb45465018f22e2752e8adb56c7e43a844a77433
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.0.98.ebuild b/media-sound/spotify/spotify-1.0.98.ebuild
deleted file mode 100644
index 7c8f16fb450a..000000000000
--- a/media-sound/spotify/spotify-1.0.98.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils pax-utils unpacker xdg-utils
-
-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="78.gb45d2a6b-10"
-#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"
-# zenity 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() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	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_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"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index f306db4a04d2..3d40bb48e602 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -3,7 +3,7 @@ AUX teamspeak.service 418 BLAKE2B fad43e28b976db44b290937654f3fa503a7a17dbba17e7
 AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b911b11175932d2b3031dabcfa29d2bafe37742a05cea5e6dc8913abfdba140f9c2203515eb5da4444b3bbdd1 SHA512 60993fa58beb07f3304e7603abe91dba2e23e3f6868a6e2894bf55e1e79c358defd1a08523e6ade16d1eb1042aad1783c76c2dff8e6ce282d08d77800c3357db
 AUX ts3server.ini-r1 723 BLAKE2B 3c5f77686b602ec052477c32e2b38ecc6812760b487ce4e6cd7616bd8aa57ef3aa186374805a1f5a073e755429a98bdb677ba400c7db3b833edc1e2e3db3a729 SHA512 cf1eb76d4fe7a8305b758439925be56ea4f34254ee3c66e796a3ba7cec38dd40009f455672429906c31631f4877fc70d6fde16a904239da2fa62d121b43d0481
 AUX ts3server_mariadb.ini.sample-r1 764 BLAKE2B 3d8b9e88194b54cddb945860c77d497fe8e4bd537a39a101d2658a44b72568a671e301bbb1888099907cbc36c2aba42b89a2215f19ffa8e0acfd3f417a08ba8d SHA512 861f0074e4521947fa44e2decfff172bb14f9b905c37dfc37afedcd5f42d864de7712aa0a6ff7eb17b8f885098abb720b29b16c658955c3c8aab73e451def6a8
-DIST teamspeak3-server_linux_amd64-3.7.1.tar.bz2 8658067 BLAKE2B 83d91ca9c77a53fde15efced19229bb94c140566b73f209ef340af9208a3a47271295682ab435bf325dc725cf1475614a85049b625c67c7e5c387b6a44337747 SHA512 8d1e9b90a83beb1f05f8f9ca8d79a7aed27880b41d34de0def5184c902e3d8a3bed4e1542841bd3ebcc179b90f6d335c00802b700f8caf8cd05e6d7b6e10563b
-DIST teamspeak3-server_linux_x86-3.7.1.tar.bz2 8506454 BLAKE2B 19052edf1db9a380ae7d9a9cf8464d058f5486adb80060b144feb7a832ccb403b3233ed21a998ba432c76ad3ca2f7969aa6e10a5e8c111d590e5750071f51a28 SHA512 1b01941a1f28a02d01b8685971f6c748161343675739ea46b8efdfc6fd87834478f23057d87fb394c27819e40960577e1eac7a482ad76d90ca2a6535196c9589
-EBUILD teamspeak-server-3.7.1.ebuild 3046 BLAKE2B 3b1eb27994eb61bad68c0b2aae5e046ea6fa2ff187bf8bbaa1b50c1bfefcf02d4a1d5ed46a6cb5095e69e98ff490bb68ac5a9801678c4d44a9468ff5f81eee62 SHA512 47177f6e3c6896de9905838617cde8de4ced395036f74f0fa9707696c9cfd240ff731f88be4e09e8ec2ba498606f3c198e1b3cc939209e0542420563f489dee5
+DIST teamspeak3-server_linux_amd64-3.8.0.tar.bz2 8870218 BLAKE2B 7dd9dbf712699f85e910b219efa5d1a482a61561ed1aba9fb9529f54679e0fef3ace95fe9bc3e4fda8e790b199b4d6e16340b6ea0b88acb9d5b84b452d743a0d SHA512 30e4886441cff8291a82f5a722c3eeecdc2e1c5bf2bf4e116d45a846bc3998554118cc57b65aeda7375523d87bcd09c9e2693451c055dfa5f90f3adb05022ebf
+DIST teamspeak3-server_linux_x86-3.8.0.tar.bz2 8765855 BLAKE2B 6af9414cd3dc3a4f4d6005aa24811bc44d6ef48199e5e49db8f82eab6a4319eb6f364a717e0191516e5ce26b54c8b26481aa0eddca8989a06f6acd31bc3ec83d SHA512 3fde2244dee1879d0ce1e1606973e8bd8ed30bb0a3eb0591a0f227b468007f4c6fb7ca8be867e1e1be177584a5c5ecb83fc2cbd93050e2937e8e6ade4473564c
+EBUILD teamspeak-server-3.8.0.ebuild 3058 BLAKE2B 6c4a38c05b7648ffe66683a4dfa82f63271e5a4578f3e76c4074a074b587ae11c3047cbc658a1e99dccf8186f49459c73f83386ef8bebdd4a3d44183346eb6c0 SHA512 f79456d2de8a080850d6a253827f9ce08668dc8f9297c1238c33aa4f9628bd0368904b6d853657bb0911b32d68c6d760e2a82ddd6d40c3e95545a628ef5028a6
 MISC metadata.xml 822 BLAKE2B ac5c32d28c089f00c7ac508d60d90fff40313dcb4758145401d4ebc76dd53f449834373475e7437c37b8892be6d121be5c2ff1b20cbbdde9c110cab4e1a1f760 SHA512 7265c0f252a1b7e1e4e2901773b81fc7e96d0b6da39475f1e7c65a37c75188f86ce3da13b39a1cf8be46b9ad80945fc3a5755135d6bb2c63829d13a0d3c1dc10
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.7.1.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.8.0.ebuild
index 019e11726567..5e3cf10c64d3 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.7.1.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.8.0.ebuild
@@ -8,8 +8,8 @@ inherit systemd user
 DESCRIPTION="A server software for hosting quality voice communication via the internet"
 HOMEPAGE="https://www.teamspeak.com/"
 SRC_URI="
-	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )
+	amd64? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
+	x86? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )
 "
 
 LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
diff --git a/media-sound/tuxguitar/Manifest b/media-sound/tuxguitar/Manifest
index ba38480a6bb4..9847b5b5ba3f 100644
--- a/media-sound/tuxguitar/Manifest
+++ b/media-sound/tuxguitar/Manifest
@@ -1,4 +1,4 @@
 AUX tuxguitar-fixed-ant-files.patch 10154 BLAKE2B 23f18334ce752a657f65a850c4b45eb7685b7937480977973d327c14d10ffc7e66f154d0d465dcb24ab39f7ae76fbf796e3df6571a3ff049fc116eaaee6381d8 SHA512 90b732cddf4684fb99a91e581903e64cd039ef9b9d8ec7bc9629ce8da889a6b2961f8f5dafd6cce21eb0c67e2e5501586580081f28c702de88ddd1d229769013
 DIST tuxguitar-1.3.2-src.tar.gz 82294553 BLAKE2B 74e0e4b0f2d3d63dbf8f16db43a165f77b39ad54e21091520c06228ea789161a6fb65a1a05bde0f1473afe61e2d990f646b5228b9fe19c114da21a5c32aa32b6 SHA512 fb94472df25578d94ad11cd385cfc9347bfefcdd8ebedd2e785f3645d6b2e0d6d87d3fc457af159865b3fae77ad443ac4246b3c6fbe42397f4d15908dd3b7149
-EBUILD tuxguitar-1.3.2.ebuild 3483 BLAKE2B 18083eb4e2bbc8a037421a0bcfce40da88f985de4e1813761ef10dc4d36e5a69a58b1533aa2ecfd121cec1a55279ca15f874a3d5c6e177027078d0ed7311f28a SHA512 59b1388d65ee76f57333773668312c27053bccf6e6f669bf6425bded7eab9afae2c51f10ace6109ec1b5cc865c063c155ff00e96af578b8eeab84870f8e39cb8
+EBUILD tuxguitar-1.3.2.ebuild 3456 BLAKE2B 2115b95150df4ed966e8fbc178242c358de7a02ed8af1ad46ac634ccdb33355ccf2232ac4ea10ebe8d8d4ed54af002bee555c359e4716c553cb2469e0dfcd265 SHA512 12e22f09292b0f53fcf2332765af046871e837475d8302e97d4a8b531c4f244526f71bb09497837bfffc94e397f29089cb09ff9ad0a6ef9c91417778a260739b
 MISC metadata.xml 1287 BLAKE2B aa7c3b560d507756eb72d602038017dd94e3f261a2a0255ee12441ef60b4772015f332109157e28cfd29ef3784cce6061f488f23ee5b8b9e42f430facff44008 SHA512 4249950599126709e668de28b8a8a0ac4dfa8b118b34f738e6eb7b610f6ed0fb2d11a962631bffcb52d552ee950c5045394e0df89dc37b5b9c9ac4648f86e2d8
diff --git a/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild b/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
index 61ca5827d67c..7c0a2bf1b65c 100644
--- a/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
+++ b/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
@@ -1,39 +1,40 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic fdo-mime gnome2-utils
+EAPI=6
 
 MY_P="${P}-src"
-DESCRIPTION="TuxGuitar is a multitrack guitar tablature editor and player written in Java-SWT"
-HOMEPAGE="http://tuxguitar.herac.com.ar/"
+JAVA_PKG_IUSE="source"
+inherit desktop java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic xdg-utils
+
+DESCRIPTION="Multitrack guitar tablature editor and player written in Java-SWT"
+HOMEPAGE="http://www.tuxguitar.com.ar/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
-
 IUSE="alsa fluidsynth jack lilypond oss pdf timidity tray"
-
 KEYWORDS="~amd64 ~x86"
 
-CDEPEND="dev-java/swt:3.7[cairo]
+COMMON_DEPEND="
+	dev-java/swt:3.7[cairo]
 	alsa? ( media-libs/alsa-lib )
 	pdf? ( dev-java/itext:5 )
-	fluidsynth? ( media-sound/fluidsynth )
-	lilypond? ( media-sound/lilypond )"
-
-RDEPEND=">=virtual/jre-1.5
+	fluidsynth? ( media-sound/fluidsynth:= )
+	lilypond? ( media-sound/lilypond )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.5
 	timidity? ( media-sound/timidity++[alsa?,oss?] )
-	${CDEPEND}"
+"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.5
+"
 
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
+PATCHES=( "${FILESDIR}"/${PN}-fixed-ant-files.patch )
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${PN}-fixed-ant-files.patch )
-
 LIBRARY_LIST=()
 PLUGIN_LIST=()
 
@@ -116,8 +117,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 	if use fluidsynth; then
 		ewarn "Fluidsynth plugin blocks behavior of JSA plugin."
 		ewarn "Enable only one of them in \"Tools > Plugins\""
@@ -125,6 +126,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }