gentoo resync : 27.10.2021

18 files changed, 180 insertions, 47 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index da3175699cc2..3556b9fd52d7 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index af72a95b3573..0c1c5b345b8c 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,7 +1,5 @@
-DIST abcMIDI-2021.06.27.zip 605658 BLAKE2B b522c96b7f8990f297cc13a3334872763fb2879f5893f09e630d66ab425d1772e0eee64273249d26e8118c6d341dad84129e140d8c309adab160f3120b5a18a2 SHA512 b1e4a7a9b93e6633abe211258995cfa84bb8eaed3870ed20e244aa12353c6cc351ea7e1c842e4e410dad9dd91b2e8c918826138bec39503c56e95062f4a99f37
 DIST abcMIDI-2021.09.15.zip 605783 BLAKE2B 814dbc75489e0df509219d64d3a094a1988832f38199236559cd2137890855acd18e5cddd1fc82dab942e183b8fd18aa1cbc1b0082bd7e6c3bc89180fc196ba5 SHA512 2bce8af706b51d10ee250cfa770d6047929bd575af57b4ca24c08e55b7105d25ec117983d2e84f4bc35350da2c0b351dd27585bbe6580846b23a3a91f523d7ee
 DIST abcMIDI-2021.10.15.zip 607327 BLAKE2B f36d212c582c4098faffde797c55fcbfde086dd64cfbeca9f58300d80eeb519f3f5aaebf6649bab25912115c583a0e11998dd9c5076547bd77009749051ae7f2 SHA512 f9877444c28add8d036223d1f8aa309928d14a26b923509411fb5781192c77292138a02837015673a92c724b0ce59aa8fc11c66177371c9dd1d23501410f01e7
-EBUILD abcmidi-2021.06.27.ebuild 676 BLAKE2B 916e0595b5c1cbf9dad1ba1c9fd7fdba8010898e12ebbc95ef02bcc725cb22a44e8608bf07ec3dd253128aafa3af728ae3709bb9a8bef786b3e6124cd32ae7c5 SHA512 3f000a5a47de4dcc3da9279dee49e962f526833ec4f85dd7f2d749d54b4c08057a99b53deef3c978f7dd1840ffd96b97d3db875d7bf559e27e18042eb8dc8bc6
-EBUILD abcmidi-2021.09.15.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
+EBUILD abcmidi-2021.09.15.ebuild 676 BLAKE2B 916e0595b5c1cbf9dad1ba1c9fd7fdba8010898e12ebbc95ef02bcc725cb22a44e8608bf07ec3dd253128aafa3af728ae3709bb9a8bef786b3e6124cd32ae7c5 SHA512 3f000a5a47de4dcc3da9279dee49e962f526833ec4f85dd7f2d749d54b4c08057a99b53deef3c978f7dd1840ffd96b97d3db875d7bf559e27e18042eb8dc8bc6
 EBUILD abcmidi-2021.10.15.ebuild 678 BLAKE2B b09a3d0f7474ccaebf61cb08b70511e4a6a968af676434d24a90773632503424befdfac284b762eb02168f5949fd79c2349ba36fcf3f1f10c721018b0750f689 SHA512 280fe2968d73a5db39665edcc822938f8ed2ea7f47108dba58a42cc3ae4a053a0b7db4ca67db090d5a77e5a9aee14700a23b73c9494b1dcbba2e9f07a04580ba
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2021.06.27.ebuild b/media-sound/abcmidi/abcmidi-2021.06.27.ebuild
deleted file mode 100644
index 0245e20b7e80..000000000000
--- a/media-sound/abcmidi/abcmidi-2021.06.27.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	sed -i "s:-O2::" configure.ac || die
-	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2021.09.15.ebuild b/media-sound/abcmidi/abcmidi-2021.09.15.ebuild
index 10c98f2d31f4..0245e20b7e80 100644
--- a/media-sound/abcmidi/abcmidi-2021.09.15.ebuild
+++ b/media-sound/abcmidi/abcmidi-2021.09.15.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 137119453c09..9870489499fb 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,3 +1,5 @@
 DIST drumstick-2.4.0.tar.gz 2094661 BLAKE2B 98f79081e9aa942b24355f86a14bb273145b7d764f19ad671050e74546ff513ee76fe2dac290f75ea1b1c54a709232da0f26e63d1829a5317174793692f2664f SHA512 633ae93c11f22999b6cadac7481e162d6e24499b614ba58e785e73b6af39a1cfbca235fcbb4b21107840f1e4dff059caaf32f9945ea80434a5017b816f62774f
+DIST drumstick-2.4.1.tar.gz 2014026 BLAKE2B 4e2765430438505c910919d5a5069b13a63e72083c4a40bd8b406e3463842ccd5ab024f4a0fccbceafe808e3926b3be03e98338afcac4520de978b0f5c950ee8 SHA512 5063201b643cd3e58db4c77521444e7816febb39ceb739309ac63b164b2fc67b6bdec16a98945141d7b41add41d82b2bd2ddf99890f12edb2f86b73e643ac6d6
 EBUILD drumstick-2.4.0.ebuild 1280 BLAKE2B 84f086bcf5bfa81e6f700d1ee82a871daa32929d353db06d91cb572dc18c50dfc25fad9da53a058863281c888bf8fdb2013dcb92baac52ccb1e9b9463c5917b9 SHA512 85a2dc9eff1690c4b441a8b44a3d0bf84240c97fe5a8feb518ffe27b4ac289c46ba78f5709733d6a48a96519f0523cb05700b7be7bfd6db579fef3b2e0225804
+EBUILD drumstick-2.4.1.ebuild 1282 BLAKE2B 019bce62e329ed8f99d946684005d3e9c57d45ef48a9bdc5fe4ac81c6d9f01a8adab66f01bda027d29b6e42ccfc8dd40c24a9a34a40593703a3e25a0ed602cb0 SHA512 497b08f55faf4f3b4f7485936ff1d15515314db60d9366719116e2de469e6880fcb69027066b7f8fa370a667cb969875b589d163256e706849df393e6d03d27a
 MISC metadata.xml 599 BLAKE2B 1e9aa003d4bb54a9eba1e9ee7a9b36515992fd66bc7f876973c02e59da7dd84667ae8e839ebb1c22a1a463aedb26c5b88588277192673dae23adcd075dde2416 SHA512 59b60a0327a8febf9ddfd6e42d5ff6056a6ee1cca61b0d507f11686eb8fdb6bc2c5f614e19d4276b3c354b291d2bbb8b30b845d8d9bb9dcbadec10db6632e8a5
diff --git a/media-sound/drumstick/drumstick-2.4.1.ebuild b/media-sound/drumstick/drumstick-2.4.1.ebuild
new file mode 100644
index 000000000000..70bc8c734398
--- /dev/null
+++ b/media-sound/drumstick/drumstick-2.4.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
+HOMEPAGE="https://drumstick.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fluidsynth network pulseaudio"
+
+RESTRICT="test"
+
+BDEPEND="
+	dev-libs/libxslt
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	doc? (
+		app-doc/doxygen[dot]
+		app-text/docbook-xsl-stylesheets
+	)
+"
+DEPEND="
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	fluidsynth? ( media-sound/fluidsynth )
+	network? ( dev-qt/qtnetwork:5 )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS readme.md TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		-DUSE_DBUS=ON
+		-DUSE_FLUIDSYNTH=$(usex fluidsynth)
+		-DUSE_NETWORK=$(usex network)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_DOCS=$(usex doc)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doxygen
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
+}
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 827443168c29..8d9ec373d4d2 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,5 @@
 DIST fluidsynth-2.2.2.tar.gz 1741567 BLAKE2B 78fe02ae37db70e7aa92071aa609ff6f3dc6217827f89091ded1a8e2d30e84f3d7a095e101fcccfe720e9c3445f58e15da588cfcd7063388ab642649536b8fa0 SHA512 208956e367725de4b1faeba7d4125a6a85bb4191ef0354a7087809e93d93b8986cdc30b78c135a743104851d15f3bb09776855fa02a686de0810dd14c97851c3
 DIST fluidsynth-2.2.3.tar.gz 1745344 BLAKE2B 0d08c67532392d32501a71f1e6fac6d55a0a0a607dae914106e1674df0a96869041530f75669193305a091ec40177e2925345df24d75a369c87e738ec1f4eb2e SHA512 67f8da02714350cc0439fbdce763d00cb08d01301a6aaa3e2655e67935048b43e18968c9a52aa64c702b5e30ae2b2b4946f69e8be4af5889fa414c654d4eb13e
 EBUILD fluidsynth-2.2.2.ebuild 3360 BLAKE2B ad1ee9272aa056d67edec8ff2325c028dbea02a563debff1e6e3cdff7896610316033f544e70e7d13b537b48dddcd70717cd9283a285e8b12b6f8ae0e56038d2 SHA512 9b82983139158b67a8470c7531741e7390711e8cc803a113e5dc0068a7a6e23f824cc215c3e3c57472fd0738e3d6dceee57798ff24aed40cf7e545a800b0cea7
-EBUILD fluidsynth-2.2.3.ebuild 3367 BLAKE2B 8126d5f51d31d714c4beca9871255cb273c3fa0137eac9c5943ad9d707a24efd3fa6f9021556e518014912871d8da3cdfb29a7e012e3c362a60e37fccc211633 SHA512 d91b463664bf0c74da652a306add23cac56bbe5184ce36ebf3399b9a4a4e791368504d5e942a952464df83a967f9a796b990197e9f58d2c92994c5d62a4bb2c1
+EBUILD fluidsynth-2.2.3.ebuild 3361 BLAKE2B 4104d026e0c5ad48b59b317d7a85e68f4ae99dd318e325c2c78d1dbe0816a3377f25af6668ef62b7b31bae508c173cefbe712678b92ded6017ec3c2444b7e4c7 SHA512 f32d83da0eb860e80e2e510ddb2e1a0b858a8b4c68642b617dd5e0719db45c10f055cee9fd31edb3c2b5f27db0aba6f1f252d591f2ec8e1d03ff21405400c2e6
 MISC metadata.xml 431 BLAKE2B f739f538274e2e63b1977673b0766a594db59982ab71d6552d1e841434c4040bb7af29d441b1d9e8ce61385dbdb8e522b5591f6826a4c52f085bf004f9fe8426 SHA512 c8085e7652a504610fb841e302ee380de58a67a16a9b874447c00ee20c2d56119254eed954704e8bd4cf8e574980da2dd2f90baa5c99e59cd534e26245af67bb
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.3.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.3.ebuild
index 47b4d58442e8..55dbaf6c26ea 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.3.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 4656f1c1df0e..813887b4b8fd 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -10,6 +10,6 @@ AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f90
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
 EBUILD pulseaudio-13.0-r1.ebuild 11453 BLAKE2B 87e52e6b724603770f5d8ed003ae0801c733c97e036445f7b0279fda84323cd4bc7f25e89ed1c71aebb51e16d448dc15f5d8e0b26eac225155fa6d9c9e299295 SHA512 60b553dfa5733975526c39c269f3169e9993128840d49e99fb6c164094e77d72f47046461e0d60351ac2b2225fa5702a18977f92af811f0ff2340854f9630d23
-EBUILD pulseaudio-15.0-r1.ebuild 11138 BLAKE2B 1b975161875288a5a27c02bd877948488e3c2cee5ee5bc2cddfad3daba3827ea1baca84244db45018efbe1c370e3012675e1168095cb0bdaadd1adc3476c4357 SHA512 c857248a0b959c4642d0d8ce4b383711c454ce02bf1433e4459968251cd7da08a11e08ead5610ea886260bcb78e31a932cb048356c558cd1ad4bc11f052da0d1
+EBUILD pulseaudio-15.0-r1.ebuild 11135 BLAKE2B 3bafae7e0d4591562d78e0f61a15bdd4d64816f493b0a3d91dc90ed0ad456a5fb5c0e38272dbfc46bf46c0b1fce5e849104c3bd20968a9a4a70103ce58131a39 SHA512 e40a9486263e8617ff768f18d1ed137b5427c33de5fa4a29dc696b8dbba204ee60bcdd653a2caec4a8e8b909659131aab4d612ac9d808f19475ce345655fe405
 EBUILD pulseaudio-15.0-r100.ebuild 1105 BLAKE2B a57a7c879c6a180c9a6495a5acbbfc2bad20173a6c971737f673835f57d730b5808bad5360f3b90af6629c92d968a4b38b181fc148ee9dbccaf2a60da163032e SHA512 d40c2271be2b359ffe8738a3f49d42e86acddec899ac93695bc66453920e2b118a001404ae96e49baab3184edb6c20db90b4a9674b774b4e093444e3fd751ed1
 MISC metadata.xml 3400 BLAKE2B 5e80f40f078e30e51975512fc465417c647106cdd5076c41f6bdd9b2a8757759a1e72391a2f8a90666c60b7ffa968e5b28b2b9aeae6906ef8837a7c959ace18a SHA512 6b81f6a80d6aaf72f56d00256e2715cd53758fc6adbd0a7a5b2836d9dc30ce61fd8a591e52ebb7e33288d6a87b172f75ae610dc9b13d4c28101eea5c2d2eb073
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild
index cc9151b23f59..7781c2a71890 100644
--- a/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}"
 else
 	SRC_URI="https://freedesktop.org/software/${PN}/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 # libpulse-simple and libpulse link to libpulse-core; this is daemon's
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 32fbadb15f57..3be0d0958fc5 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,5 +1,5 @@
 DIST sox-14.4.2_p20200803.zip 1089835 BLAKE2B fa53d8c9f14620675bf534090bf6c69ec256bb977aa1b3c01b2d95ba8e685eb4f9d479872f303b2954aa1b063c095bf3b90e5b746fd8d7d66e35476e5218fa6b SHA512 8c485a53b9ecce9ecf759d7bbf8d95e568a89505bec7d1258afded4c7ad0f28c624b637a188ab87b64dee720db59b8de20c347805910f0401f00550832e16392
 DIST sox-14.4.2_p20210509.zip 942551 BLAKE2B 2ddd229faacb9190fe18052b1c02da40d4c3f24fc73dd08b28ac99bef267cb05f8bcbf64e0c397c391b3be2467667783ed94f6c60798af069567e1c237ec9ccd SHA512 4868f9b77141b7e2caf2571ceb68a48bd744732e72f63ed787f8e0b9fe39b77de4e998b32d99c2500e10b017a1fd1a3379f4f9f8b67db6093b85d02cb3447934
 EBUILD sox-14.4.2_p20200803-r2.ebuild 2833 BLAKE2B 321acd4a7c6587b310c85ebcaaffa3ea60aed488e4b3ef95fc082275e91e2170212d762a7f9de55c6e3d9050e18c4c56af3b560385f5decea16dafb75c79f58e SHA512 59e0d8bf59301124f02c2dc859c8debc4e50c62bb7055826380bdb6f2c57df51142e18af43bcf27bc07583370c4e50a75b82f3b1bdd51423c564a47ea631638d
-EBUILD sox-14.4.2_p20210509.ebuild 2877 BLAKE2B eb66dcfeec1d5ea05285b159d926654715713bce7d45ddad8c9c3b150eed770ce017b27a1781613519f7b480a17989bcc36c3a4758b98dba037b38a789488300 SHA512 259191003839140abed352081a4c76d5e0b2a109179a57c7823b4ce78415b1152b52e13ce65c74315d66989f4a9aaa8218fb6754ff1c752694f05c12e7e3d9fe
+EBUILD sox-14.4.2_p20210509.ebuild 2875 BLAKE2B ae46bd3d5e96c0f61c6b9b254308442015bd2cdd5e767efabb103af1bfdcf5012eaed532ec78635bbc56bd26d835b4122623276d199c1fdc8bc50b3c1705249f SHA512 97b27b4dd3bc79f91d56387934df3a65b396773bf5a3d2c8ffcfa6987066fbcd1d56ecdcd47ae3b533be1fa4f38e5a097558911eb32bdf7744a76d7e015a53f3
 MISC metadata.xml 709 BLAKE2B 29d863a59fa534ccdaf3ccfe73ec03ff931055b7537ce3ef1111a596c8178f944910cd3c917e25f778a1e297d5fd0023833d0a8556adb6cd187fbd59e2ff5703 SHA512 a40c70b421b78a8bf2b7044b1b512600120c0352bf61755ba7d48af621fcc33c82ef3c7eff3df10c913add4b7250f7fb7461ea7171b21a07f306794d7c1cbdbf
diff --git a/media-sound/sox/sox-14.4.2_p20210509.ebuild b/media-sound/sox/sox-14.4.2_p20210509.ebuild
index 30085c2294b3..7575b5867ffc 100644
--- a/media-sound/sox/sox-14.4.2_p20210509.ebuild
+++ b/media-sound/sox/sox-14.4.2_p20210509.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="alsa amr ao encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile sndio static-libs twolame wavpack"
 
 BDEPEND="
diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest
index 5ae15cbacefa..b52b62c1c49c 100644
--- a/media-sound/terminatorx/Manifest
+++ b/media-sound/terminatorx/Manifest
@@ -4,5 +4,5 @@ AUX terminatorx-4.1.0-metadata-dir.patch 438 BLAKE2B 848b76d7c86b049964cbdf0b307
 DIST terminatorX-4.0.1.tar.bz2 1832692 BLAKE2B 61eeb6362cdf56cb73df3bfbff65cf3699a0ef686d77894b87feab5f25f927267bc28573c3ee41981ded3b452b1d37c035260ffbe0fdcf6d0b0c0319c61a6137 SHA512 06128633e128f2158367dcde0e913dafc68d62644e7a5182a2391829dadcb9c46430d0cac16cb17113939623266f32cb4624a8548a51b8c01bdfa2860a6c0093
 DIST terminatorX-4.1.0.tar.bz2 1832295 BLAKE2B a328d05bb0c3c88719eb711dcf3f50eac08cd140e3225f42633744b39ce49f3e074263997ec21b2cc245740fa3f672a19b89d929fad1d0131981988fc80f37fc SHA512 2dc87bdbb4f4d24e10f0c8fac99b4ccecac6036c6dc950184cbdd1d05fe0a4c723ea1b04c49837fb0aa8f149ca9d2fb5d2c42f5109031184980a14fe549312fc
 EBUILD terminatorx-4.0.1-r2.ebuild 1411 BLAKE2B c226688c9595acfd1c65058abf1ce6761fd02e49026710c59b42625c8caea0179228bfddb9f1867113436844d218ca6fac347726e800bf5cbfc20c78aa06bf2c SHA512 f13956c85e3f4cfa624139a82a322dd0ac0e621d42a668429a732dd17a5c32bfe363b215810769d026a7b16e979e8ce4b4267e0b734149112ea5faf2599ed6a7
-EBUILD terminatorx-4.1.0.ebuild 1448 BLAKE2B 7dbdab35960e4605cfd585ea4c1bb17baae80d4767e7532ecc53ab0d2e5c5aa24ec195fe29da611070183b5c3f7b606f5832293157899a170972cc0a2e68975f SHA512 3253dd8009a5387951208338a26765b16d84882e1216de43f0edf40e34f921f99308da299aec90466107067ffe96d9f3a7b82910b990a320f733f4a1da64f4a5
+EBUILD terminatorx-4.1.0.ebuild 1544 BLAKE2B 2a3cf8bff673bfceaa8524f9cd7172a0ddaf1db08b5b8c381a33fedf5b49fc57556a2e08cb5d58ce974fa3364c9fb8df1caba8080c06f7c472c37f631b3aa921 SHA512 30dda39f590d1cd1df2d850a2971e7f1b0fe783ce39e6a2812dc5a4371e16f1fddfd74b0df9ecc45a50e24ebd71226cb12bc364c56ca6cf80f7078abd2f2a638
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/terminatorx/terminatorx-4.1.0.ebuild b/media-sound/terminatorx/terminatorx-4.1.0.ebuild
index 3774d5dea080..c7a57d22bb33 100644
--- a/media-sound/terminatorx/terminatorx-4.1.0.ebuild
+++ b/media-sound/terminatorx/terminatorx-4.1.0.ebuild
@@ -16,10 +16,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # Making X optional fails when disabled: https://bugs.gentoo.org/636832
-IUSE="alsa debug mad pulseaudio vorbis sox"
+IUSE="alsa debug jack mad pulseaudio vorbis sox"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
 
 RDEPEND="
 	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
 	mad? ( media-sound/madplay )
 	pulseaudio? ( media-sound/pulseaudio )
 	vorbis? ( media-libs/libvorbis )
@@ -54,6 +57,7 @@ src_configure() {
 		--enable-x11 \
 		$(use_enable alsa) \
 		$(use_enable debug) \
+		$(use_enable jack) \
 		$(use_enable mad) \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable vorbis) \
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index 7d21280de44b..71ee1e7e4017 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,5 +1,7 @@
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
 DIST upmpdcli-1.5.12.tar.gz 582091 BLAKE2B da3c0826a40e815790fa7f758c7511b5932190f0913295098e9c1fae92f9b0083ffbe2b7e95c97cedf76580cefaea27f4ef1f89326dbb67089314f6ff7f8c181 SHA512 ebe8076e3f99b525df115d11940a46a518725a34dcdfbb42eb763b6e148beb968a8e2015c4dd9e696224f3da2745b7356b3094de68332f50590a3421372f1dfc
+DIST upmpdcli-1.5.13.tar.gz 579569 BLAKE2B 30af7f455c0564e46c627217853a230bdabd0209baaa62b247388814af8005ecd0125de242c98cc20bef28adc548b5e83fa61d797535daa00cf180cad0fe0217 SHA512 bf61f7befe5fd64cdeed94f7d82965991d95abf8f8f96b044934d64aa55c887b7f4cdbc48f72a4843a5b6a145d9ccae6166e38710ce2015ccba18ac13c365ac6
 EBUILD upmpdcli-1.5.12.ebuild 1032 BLAKE2B 77a9478420316c2c6a821a41f53c7736d048f641cc1d5e01c1e897afe3b37f1b9fdaa3f50353ba307013826ad00d0071fa3753b7fda37b5fda7b533f2864b555 SHA512 3d6fad7e7496e23114743ee897644284631565ed30d1f42227f44a1bd1b7f88db63a51482141d413597185fb4f78c303e0b676d9f767338c138fa21cb967eafd
+EBUILD upmpdcli-1.5.13.ebuild 1034 BLAKE2B 0caee9f429812affd145864fb0affbe5268f06204ec9935484fe84fe45b6ae9aa198077eaf733b630d4e3a414a3f8b233ff8069d422bbedb202bd47cdc9b6e03 SHA512 034872dbd08edfdbb5a9ed3237d10fdc0c8a1e7843ba3e8e588146f84e05161831b5bd4a79688b5f724852e0bd2700e2e34cc33e657dd8be0876bfd6fe583ce1
 MISC metadata.xml 324 BLAKE2B 53acf2369d1e3957218ea3634ed2fe10034b9d74109af9df7acfcf29a37697ade6488aefc5df3503754833b0f6dc5df777feb945355f633fa6e1a3ade8b13adf SHA512 871929dc11894dc91b3257a5e9e8f5164e3f5e1af0dce2cc7571dd106cc70bd777562bb56913ca45f3bf1cf0316938f7f2c0a8386bdcf408c0f834385db4d45d
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.13.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.13.ebuild
new file mode 100644
index 000000000000..cd91d0a00939
--- /dev/null
+++ b/media-sound/upmpdcli/upmpdcli-1.5.13.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
+LICENSE="GPL-2"
+
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="thirdparty"
+
+DEPEND="
+	dev-libs/jsoncpp
+	media-libs/libmpdclient
+	net-libs/libmicrohttpd
+	net-libs/libupnpp
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/upmpdcli
+	acct-user/upmpdcli
+	app-misc/recoll
+	thirdparty? ( dev-python/requests )
+"
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit systemd/upmpdcli.service
+}
+
+pkg_postinst() {
+	einfo
+	einfo "This package no longer assumes that upmpdcli is driving an"
+	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
+	einfo "Probably it is though, so be sure your mpd is built with"
+	einfo "USE=curl."
+}
diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index f5d54f88afdc..e557ccd16b67 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,3 +1,5 @@
 DIST vmpk-0.8.4.tar.bz2 483243 BLAKE2B 12deda1ce752db4a0723e0b54e96a734cfcc11cbd2974a5957d315f1080d7d8b8ab3adf9203c8a25514f708ff6cadec69ab560239cb0f7d1b6859032ff6b976d SHA512 1704d8d39a2750549b524202e46e51507e25aeed00fe5c36202148661af2fc98613d937b2ea36f958706f371608d50ce82a6633b56e344e9cdcfed223892cb9d
+DIST vmpk-0.8.5.tar.bz2 484128 BLAKE2B d13965358d21a81053cc5c32e11d0b8a9f6fda733ef5e7295cee7b774d8ca584ee58c0f7cd5f10f0f3948528031e314d09736fe3f7c0dc94929bcadd3aa94e5d SHA512 62de7acc353b95511c1c1afd54d7c5ddb34de69fd2dff5dfccd6ed83b6e1ca2cfdcd36c1a4878118821dead8dd8b15c44a2c1138b677da3b218f8093e7a49abf
 EBUILD vmpk-0.8.4.ebuild 900 BLAKE2B 9cf7402d7127f2a41f0785feb47d4d8b487687433b9c282bbb153a8b9f3b53a7295f8a1d1086c869cde5f1e3b375949f32ec7524098451462f49413317ef53e3 SHA512 c102fcb617f4031687bc89a32fac8fb9328583c3b8b2649b1364891a59ae0c9411237a49601918963b6c7030ab2a32169c9fb53972030fa542e8c1ffccc8fa3b
+EBUILD vmpk-0.8.5.ebuild 902 BLAKE2B 175d7a2ca1c5fa21823294e007ec135b43e9f9fab56ba4be96535326fefe87fff06051e5afd1e489e99d709bf711674196997a6f6ea81b8152f46ab41a9e0add SHA512 3c0d204dccb98cdf4d58a38666177ac2b7d8fdeb2e8c8277cef4eca82ce5444464190da30581bca7c9b7211b4b71b4dd223eadc2c2e521e3037f737a9d532b12
 MISC metadata.xml 857 BLAKE2B 6d6600a0209d9d251f21c2e9f48ce1a9feffd2680a4e97c29f69f7a19f251607f7a2724e3a170b916dd3f3cad16f59ac8034621ab599f2de74171eedacea68ed SHA512 8d053c4c85a7ae69d87ea01058e0496f1a89994e7ff482e290e97afc4de2714eec397ed05129b98e9a1dbc5932a6067eb97bf17c6e05d13c6d2d1ba3747fd8b3
diff --git a/media-sound/vmpk/vmpk-0.8.5.ebuild b/media-sound/vmpk/vmpk-0.8.5.ebuild
new file mode 100644
index 000000000000..06432a54115a
--- /dev/null
+++ b/media-sound/vmpk/vmpk-0.8.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Virtual MIDI Piano Keyboard"
+HOMEPAGE="https://vmpk.sourceforge.io/"
+SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
+
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-sound/drumstick
+	x11-libs/libxcb
+	dbus? ( dev-qt/qtdbus:5 )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DBUS=$(usex dbus)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodir /usr/share/doc/${PF}/html
+	mv "${D}"/usr/share/vmpk/*.html "${D}"/usr/share/doc/${PF}/html/ || die
+}