gentoo resync : 08.10.2021

30 files changed, 260 insertions, 249 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 4780d6a3c4de..23fbf1cdee94 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/daudio/files/daudio.rc b/media-sound/daudio/files/daudio.rc
index 5f934107051a..5f934107051a 100644..100755
--- a/media-sound/daudio/files/daudio.rc
+++ b/media-sound/daudio/files/daudio.rc
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index d0e559d96668..84cb81411fc1 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,10 +1,8 @@
 AUX easyeffects-5.0.4-meson_no_automagic.patch 1520 BLAKE2B e7eb71a9aacdb80cf45b7314acc80a42c48549047e754f8154fdfd901d0b25ec16e25ca64715d26335b9f2c6f8bd5bec2803b09e62f7e8c618435aff5f97e748 SHA512 db116e3727c497774b702c6537c6cef152c5898034ebd0260df4365d65b1e8465181aefb7b5ff28eab2eb5794ce331326b1cd0f313124f3a33c61f073af15b4c
 DIST easyeffects-5.0.4.tar.gz 2070912 BLAKE2B 848d2fa6fc1290b6fc25e13c4bbe4d8df932af63b8fb7e9642c6e24b29360dd17efba71ae0daae265538cd9cde1d9e33de453b0c469e3d54709a3f337cd583a7 SHA512 78074341c8376a4918d09950fd7db8804346cd2e00d6849da464662643809010eeb1d009c44ca5d3eadd2faf3bb9c43a18a41b7c3e77b883beff44618967b30e
-DIST easyeffects-6.0.3.tar.gz 1905373 BLAKE2B f423cefd0e6124ee1128bf5a07fb23df03df4ca25a6ebcbcd122032e5768ee68ff3464cdb51263d731fee3e9f5fee180858d96ab627771099808b1194adb78b1 SHA512 eb88f0befb6cf86b7da03137cb7ed6ac833f204d17860d9bd508dc8b007b2a0fb941b63a015b1179cb4da28abd0b3d8a8c53d026fd5a22057fee27e02618035c
-DIST easyeffects-6.1.0.tar.gz 1921987 BLAKE2B 419f8e88ff9fc1e40779f91efca4eb2b3145b1fcad885fd376a73d8b8dd3f7a0af43a73361e22c02e739503a3ca4d91885921848e3d8ef9186b2907b0e400476 SHA512 2a6ed01377f5bd4f6891980f2b22d499da8369207069b7869e146543ad125f274bbc61ab0f2608e8737b2650df0bedf0b619a3eb200e3444ddfd0ae8960bebfe
 DIST easyeffects-6.1.2.tar.gz 1924029 BLAKE2B 74b5cbf2c7ae93ce12ee8ff6a6931f258b7e56b4af91a6b9873cb795309dbfb690fcda51584edd35adf05e85788070f698cbb6e4a914be0b7c5630bb0815b041 SHA512 2700dbf335a2414b3a294b66eeda8c12eef0df8a6f62b53fee9b6f0d5877f13d5791b24fca3d8560e84ae3d3bdbbb11d95f50934668f250f6052d3ba08711e10
+DIST easyeffects-6.1.3.tar.gz 1922869 BLAKE2B c92546ec8e1b67b09c9c46a21296fc77cb76617a581141ed6c01f57a00beb0f1428a70725918a627dcf1136b118daece89215084588d428a7673d6f2270f588a SHA512 ff3724abd821eb076d36b9f2543386bd899371d4401697b620292e9504a90f01a40c5a824e5517613747c2a3a872b3e72c8d798655069bb36742417523a968b3
 EBUILD easyeffects-5.0.4-r1.ebuild 2272 BLAKE2B 9a0d0a24d713e2effca773730c0b7e7afaf83e4561b5bc83ca1459cada358e039e7b8fe7ded4c6dd6ec8f30ca8ea12d33fc65822b5ae2d812f320e71c2634a10 SHA512 b51edb7406290d1389ab8f98efa47c0739564ea8aee982acc27a4f544b5fd35211220b7361b7697b2d4f1b63e1d6e645016a4050c2ea482673e986dd314a31d0
-EBUILD easyeffects-6.0.3-r1.ebuild 1855 BLAKE2B 8a8f589feb8ad0bce561cd0cbb3f5ca083f0f37eddaf897b216aeda605eeb3e33c2b20428fe21864391da33720ddda0f8d26ba1faeb18f30ae5a20fb66ffc150 SHA512 8cd9c763ea0978c4a6f07594b41043f1256eff9c7e37f24cb13b180e6cb1baa3830912eb88ab8f6588462ea5e77c49ab0f97a1f33fb8203aecb47c45ed95e721
-EBUILD easyeffects-6.1.0.ebuild 1995 BLAKE2B 5e9b574dcf1121d5497af2feeb2e8c30e0eab2c003b09bcf87c14edd75be3135fdac40e7f10857fe45a459305a2596224f2cf106acdcff0bdf5efefca1035622 SHA512 7571ee5331c5a547cfa6385ad00e2f4c66be4c0ec5108ac543c471535b02647d60c2431b69645a85f8556579bf28a33816e6e8c0bc49d61e4207b8c47c7eaec1
-EBUILD easyeffects-6.1.2.ebuild 2008 BLAKE2B 9828e0f5a814090892a0a423593b324124deb6b7a8d083a77f8ebaacc98405858d745b0bc0b91a5f326629db4f0bc7887a91f4cfa66cd2839ab93741ede04bc4 SHA512 b1a46a3ab371076ffaca4471548d8b4c8eb7a3c8aff408ff9e89051069a15cdbc79234b3faacfd890f46366cc03a03f970bd0b9051a1f4a1aeb2009de795fd6e
+EBUILD easyeffects-6.1.2.ebuild 1992 BLAKE2B 94f5e3065ac7a8cc3e29ca4c4659b3657af5e4ad5e537d3ce26022e12403bb17850109f99f69039f96cd0efb6224d36cf328ee0d0f035c17e0cf9caf231f6899 SHA512 47d913562ff73adec27786aa2247ae11faea4cb8ca939197db6418dd3a2809567c6aa27f03fdbfbb13e4104ad57f768973fa125d098d333f791f26ee87b9197c
+EBUILD easyeffects-6.1.3.ebuild 1992 BLAKE2B 94f5e3065ac7a8cc3e29ca4c4659b3657af5e4ad5e537d3ce26022e12403bb17850109f99f69039f96cd0efb6224d36cf328ee0d0f035c17e0cf9caf231f6899 SHA512 47d913562ff73adec27786aa2247ae11faea4cb8ca939197db6418dd3a2809567c6aa27f03fdbfbb13e4104ad57f768973fa125d098d333f791f26ee87b9197c
 MISC metadata.xml 1285 BLAKE2B 2f08a86e1d8dc764ab015461101f7983cbad6c4856239ba2dcf332e23f3cbdeecb9e93bd464315b86125b708e8dba80008f1536dc4cc8fe240137e3cfdf461e5 SHA512 6bd4a58517ba2124ec04cb7dcbc36fc8f029729041abe623e1e4de8671439bba2471bb6d03febd780b820a2bd9b37384dc3c289c87f6eaa39d2005b544f16cf6
diff --git a/media-sound/easyeffects/easyeffects-6.0.3-r1.ebuild b/media-sound/easyeffects/easyeffects-6.0.3-r1.ebuild
deleted file mode 100644
index ea66939912e8..000000000000
--- a/media-sound/easyeffects/easyeffects-6.0.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils flag-o-matic meson toolchain-funcs
-
-DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
-HOMEPAGE="https://github.com/wwmm/easyeffects"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
-else
-	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="calf mda-lv2 zamaudio"
-
-DEPEND=">=dev-cpp/glibmm-2.68:2.68
-	>=dev-cpp/gtkmm-4.2.0:4.0
-	dev-cpp/nlohmann_json
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-3.0:3
-	media-libs/libbs2b
-	media-libs/libebur128
-	media-libs/libsndfile
-	>=media-libs/lilv-0.22
-	>=media-libs/lv2-1.18.2
-	media-libs/rnnoise
-	media-libs/rubberband[ladspa]
-	media-libs/speexdsp
-	>=media-libs/zita-convolver-3.0.0
-	>=media-video/pipewire-0.3.31
-	sci-libs/fftw:3.0
-	>=gui-libs/gtk-4.2.1:4"
-RDEPEND="${DEPEND}
-	gnome-extra/yelp
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	sys-apps/dbus
-	calf? ( >=media-plugins/calf-0.90.1[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	zamaudio? ( media-plugins/zam-plugins )"
-# Only header files are used from libsamplerate so put it here rather than DEPEND
-# to avoid unnecessary cross-compilation.
-BDEPEND="dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	media-libs/libsamplerate
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if ! test-flag-CXX -std=c++20 ; then
-			die "You need at least GCC 8 or Clang 10 for C++20-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/easyeffects/easyeffects-6.1.2.ebuild b/media-sound/easyeffects/easyeffects-6.1.2.ebuild
index 88d5ad9d6625..92750db2b8fc 100644
--- a/media-sound/easyeffects/easyeffects-6.1.2.ebuild
+++ b/media-sound/easyeffects/easyeffects-6.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome2-utils flag-o-matic meson toolchain-funcs
+inherit gnome2-utils flag-o-matic meson
 
 DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
 HOMEPAGE="https://github.com/wwmm/easyeffects"
diff --git a/media-sound/easyeffects/easyeffects-6.1.0.ebuild b/media-sound/easyeffects/easyeffects-6.1.3.ebuild
index a279cae4a3f9..92750db2b8fc 100644
--- a/media-sound/easyeffects/easyeffects-6.1.0.ebuild
+++ b/media-sound/easyeffects/easyeffects-6.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome2-utils flag-o-matic meson toolchain-funcs
+inherit gnome2-utils flag-o-matic meson
 
 DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
 HOMEPAGE="https://github.com/wwmm/easyeffects"
@@ -18,19 +18,19 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="calf mda-lv2 zamaudio"
+IUSE="calf +doc mda-lv2 zamaudio"
 
-# 6.1.0 tests fail due to recent changes to the metainfo file.
-# TODO: make sure this is removed come next release.
+# Tests fail since 6.1.0 due to upstream changes to the metainfo file.
+# TODO: check this every release.
 RESTRICT="test"
 
 DEPEND=">=dev-cpp/glibmm-2.68:2.68
 	>=dev-cpp/gtkmm-4.2.0:4.0
 	dev-cpp/nlohmann_json
 	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-3.0:3
+	>=dev-libs/libsigc++-3.0.6:3
 	media-libs/libbs2b
-	media-libs/libebur128
+	>=media-libs/libebur128-1.2.0
 	media-libs/libsndfile
 	>=media-libs/lilv-0.22
 	>=media-libs/lv2-1.18.2
@@ -42,10 +42,10 @@ DEPEND=">=dev-cpp/glibmm-2.68:2.68
 	sci-libs/fftw:3.0
 	>=gui-libs/gtk-4.2.1:4"
 RDEPEND="${DEPEND}
-	gnome-extra/yelp
 	>=media-libs/lsp-plugins-1.1.24[lv2]
 	sys-apps/dbus
 	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	doc? ( gnome-extra/yelp )
 	mda-lv2? ( media-plugins/mda-lv2 )
 	zamaudio? ( media-plugins/zam-plugins )"
 # Only header files are used from libsamplerate so put it here rather than DEPEND
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 7e51f95a97f4..e7ade41143bc 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,5 @@
 DIST elisa-21.04.3.tar.xz 1725896 BLAKE2B 4937403cb1e58c23979ec5525232f227a92f4cfded11127af2cbf62b1f0a72163f39f1a02bec5e9d5acb9c78659f66bb3519a7ab322aaf3a5be7f855975cf365 SHA512 12a83267332f3d36d4906cd9dbc6c46558cd5a3efbf67ccdcfc53156e4e6b3cf334cd05033bc299105ce72df3625852ba8b9dc1438c0b50b7e29798796699ecc
-DIST elisa-21.08.1.tar.xz 1738088 BLAKE2B d0dd167cec9ca72ebe8eb6ceb7a8c06c607e4fab355bade0a16b9bd784aa332f7dd1a39d879413a84e6b6ca111cd436cf8bae93cd28456165091ccedfeea7910 SHA512 675bf5f44fd451ae93f8ca157a8866f948ad8d8627c3e7f729ff0e8ca7bbc8be8f37ead26612ae69102f97fc21fd1514010ad7a442b5a86bbd547ec4630ef944
+DIST elisa-21.08.2.tar.xz 1738284 BLAKE2B a1c8d2d8265d297dcda014f458fc0a620fa529e21571bf3053eaad1cf5e128b7525e69550b11f1a2b31fb895643e43728105a5a387ce4caa320b75fabeb8bba3 SHA512 a24fdd08c7ae42d7364c32d9ed58fa7d2bbd56e143c96eec60e2b7f4bceb883c0c681678a96afe206a8cf56aa216d5bde44182ff38fa21eba647bd95f15a4572
 EBUILD elisa-21.04.3.ebuild 1647 BLAKE2B 732a7150c9aaf95f42078b20069a39321445623cbe46aa1527acb3178a10a7a16e78e55274c77b860a26cc31eb8cd468083bf0949824ca34b462d0b0e9194814 SHA512 514bf14e4839faba7ab708dc8506503ca2d1157d21b9caf95e6712ee593d0ee4863a29cd887d011fc96c5c50956992e561abf2423fc3c43d2549e1ebd82515b4
-EBUILD elisa-21.08.1.ebuild 1648 BLAKE2B 96e61bdada10abf44a1543f090e09ce0004a5934b5c6f24764c8c4de67fd1e688a0c2f15a198b7929d5f5ee3be6786e1f5e33674559b62228ad8255e43485fe2 SHA512 e43a44653f0a85834f799827259692dccd2e38fc690bf40fcb7a878c26adb14d6a256a9462ad9ebdd69ce58c1cfe0bdda4cdd2593c537b70b32925209578b560
+EBUILD elisa-21.08.2.ebuild 1648 BLAKE2B 96e61bdada10abf44a1543f090e09ce0004a5934b5c6f24764c8c4de67fd1e688a0c2f15a198b7929d5f5ee3be6786e1f5e33674559b62228ad8255e43485fe2 SHA512 e43a44653f0a85834f799827259692dccd2e38fc690bf40fcb7a878c26adb14d6a256a9462ad9ebdd69ce58c1cfe0bdda4cdd2593c537b70b32925209578b560
 MISC metadata.xml 493 BLAKE2B 34b3c8c5f95ef87ae3246bc61003e44b2e7c72e1a98f0fc38e9c8f51934066b4c375e403da5e5c1525d88c33aecc1e91b0e1c7a537d89411678f4e6e26da6586 SHA512 e59ac559e2ef11d5f3550b95fac490059b1f6be76ad5781d0be5e45bb860c0709992cb928fbc1e2584d1ad71359c9c65e2d53cbf124f411d1b6b016ab583e751
diff --git a/media-sound/elisa/elisa-21.08.1.ebuild b/media-sound/elisa/elisa-21.08.2.ebuild
index 4e9fd54d5b2f..4e9fd54d5b2f 100644
--- a/media-sound/elisa/elisa-21.08.1.ebuild
+++ b/media-sound/elisa/elisa-21.08.2.ebuild
diff --git a/media-sound/gmpc/files/gmpc-11.8.16-icons.patch b/media-sound/gmpc/files/gmpc-11.8.16-icons.patch
index ea37effa9f74..ea37effa9f74 100644..100755
--- a/media-sound/gmpc/files/gmpc-11.8.16-icons.patch
+++ b/media-sound/gmpc/files/gmpc-11.8.16-icons.patch
diff --git a/media-sound/mpck/Manifest b/media-sound/mpck/Manifest
index ea08130c206c..c7c541383bee 100644
--- a/media-sound/mpck/Manifest
+++ b/media-sound/mpck/Manifest
@@ -1,3 +1,3 @@
 DIST checkmate-0.15.tar.gz 198526 BLAKE2B 21ff0e0eef95fc8d9d25ce9e182a48efab4527124ec340510556b16476c52794940852382a72ce402638857c3149c55f2dc5190f4ab4d3a1485c86c9994d98cd SHA512 a1d8de736528cd7e0d0c07fd48eddde907aa17cc49841815454d43d64258443dbf0e903696bb11231c35240e0ba8fbde67921edbc5045ea21698ea4fa2f5a6e6
 EBUILD mpck-0.15.ebuild 407 BLAKE2B 99fe46afd279ce5e77d187f45416d6f33db3a6a53851baaddfb462ef8b8aecf3927012ba49cd500e0a0836d54d412e831a65a9a24c1950d3f42887f45f283ea9 SHA512 df3698741eca0ee092602404eeb25ae6865dcddaad4afed3d4be95b07974c4a042e61ed6e1fade0f4d9e4e3e452ab0bd58f8bb9ae1298583f4e6e9324f1a028c
-MISC metadata.xml 356 BLAKE2B e5f5c895d5444d9cce1b97854e064e8453475eafe3f7e30a26a239f0f27fa19b778a42f6eb30066b05c1e4b57527283cce9da2bd04a44bfb06e733baf2164b90 SHA512 1bc9d6cfbbe209be1000f295aab25fc22f1226ffcaab15bcecd17305f0dc7ce61df30817234aa93f5e3c42a7bfb733549db3826914aedea54915daaa412df069
+MISC metadata.xml 252 BLAKE2B 648cca48f0a3b65ded6fd96d45d3f23cfae98bfa6b5f683383f1f49eedf763f99e034958d5a91ef3bf0904304eb7fa78dd7a582cf337762df4bd59c1eeaafb4e SHA512 cff6482e227806ef72806b8b925a4f5a3dfb87c26007a4614e1891524f18fb33c49d4d774d824676b02664d2703d8d8e8605e2f15983346868f4ba49405b75c4
diff --git a/media-sound/mpck/metadata.xml b/media-sound/mpck/metadata.xml
index b47360931e8c..0fe4d742016e 100644
--- a/media-sound/mpck/metadata.xml
+++ b/media-sound/mpck/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
-</maintainer>
 <maintainer type="project">
   <email>sound@gentoo.org</email>
   <name>Gentoo Sound project</name>
diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
index 3181745837ea..beb942008537 100644
--- a/media-sound/mpdscribble/Manifest
+++ b/media-sound/mpdscribble/Manifest
@@ -1,5 +1,8 @@
+AUX mpdscribble-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch 682 BLAKE2B 2f5944640d764dc77e601f74b22ce8487c80ec69827b3c3d551e732c33e38b126048e9c877e37e1732ffd18ae57808ee3fb1dc529653da1fa523be8499fdc0bd SHA512 65c153616b9b7d471cf793cec3294aa983247fc5b9c218a4fdb9ff9825c38499f5bfb7b81c1a98506e9102d1bc347e94d21f2296d50871787cdfada03a69aaaf
+AUX mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch 1407 BLAKE2B 9c70170c57f1eb1c43e22e824f1c208bc4c72ad751e10f68195e42fd331342bca4bc3066af671382258102bc63dd75386ead151e0ca8218e8df945373293db7a SHA512 d6c5582a7f4fc2059679ac8bba7dadd63133166522d63efce0c4adb77162fcedc8bee9d03cf4d192d9c6f97e827225b1993d0831e752f5c54f4badbab278a269
 AUX mpdscribble.rc 475 BLAKE2B f57a87b042cd60d87119ea396bd84bdf846a04fcfadff69b6bfa6700cd177dd95cb5e7c753fc51eb4916410a64e20d42dff1a9e0b5024f2ad1d1d7e3ed3751f9 SHA512 b82d3e5678aba145a5c8d172ebf74960d164e3e934426cc755948d795743bb07158f502705d40c1730a40b6a6d73e84c5792419adaf6ab83ec7c33756f0abb43
 DIST mpdscribble-0.22.tar.bz2 116981 BLAKE2B 13b15ca9e49faa3e5d254bc2864de4a0c409d8767db586def3a7bee415c67f84ddffbd7fce6093afe4aba5d5e66db8182aed52d9a141bebf4094a400f2ababe3 SHA512 bedd93392a4d5a0609dcaf7aefeeff3851f3084da8c34a4fc1f8fde51c2ba10b8370ac52cc8d55f0c9a96fffed975827a0935087c2c51880b7bfef8d79182dc8
+DIST mpdscribble-0.23.tar.xz 46624 BLAKE2B 47c59a4b2936b7990bb2d8563422c553d1e08b39a09a873fae1ad0215bd1fcc0dbcaa69e62eab9332530717a200a52295018a578e3c615e83d68d84564060402 SHA512 f924076a8aa201f67ba81e72a44d3dd1c31618bd87e4f75f6b63f7b3814fa08f6ef4f7964b1d518c5f8b68a1f8ba88f867c08ed8b0387157eec8e9f97eb0b825
 EBUILD mpdscribble-0.22.ebuild 707 BLAKE2B 2ce67900b9bde1e81839e257cf3365f934873177b9675113915f6c46e68b6de006e703e37930162ef07558f46a0213ad1d06ecf038dd0546788388ac51ca0aaf SHA512 e2aaf1b1bb18bb8a0311b3e34379669666606fc2af58b2eaec6098dc88b2cb9a6f25a5c0db3ec01d83a68e041853a2c6963e01b1466e15400c188d604c27e131
-EBUILD mpdscribble-9999.ebuild 764 BLAKE2B e35259c4ac7ee6500a43f2d64139c5b36577b29703b2abd28ef52a2a1d8ce71c46b928edad256f3ab2fdebc877c136e9b41bd66b9e9d703e68704e3460e8119f SHA512 642d0f4699710df0da80f7bb65f86618e3c598002080277c829a2bfe5695bac82842b3ec0909c8c9f5ba3013fcaee40aece4e26a43d22600d63eb32cd449d1a1
+EBUILD mpdscribble-0.23.ebuild 996 BLAKE2B 6dfab0da40252d9cff82ccaa8be94dc8e29cd4a7d364e48f461a0fd5c38f2bdb89fa8d08c75d6c348aab5ee17e66fb9ee179b35398f937236ccefaa5cb545c0e SHA512 b6233debc73437394a252c2514b64a17d8fc10ab8517541741f2d9ffa0aaaa8e433958185c26b2aedbb1d358c802875be2a4e9c3bf5ecabcfe25a163d109413f
 MISC metadata.xml 784 BLAKE2B c38018b5bc728569e23dccc11fe4509b916448fec5316ac7170fe2fd4decb9a4ed568f40d039ed2d514e22209c18033f14324a5ff26521658e27e79c4102eab9 SHA512 f52ee040880383020d9f945359fd2597b44898fa215619e2ad435dfb1128791f8fcddcaa4cf1426712d684e3c1fa41e35fa35e1920364199e158cf24001c1443
diff --git a/media-sound/mpdscribble/files/mpdscribble-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch b/media-sound/mpdscribble/files/mpdscribble-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch
new file mode 100644
index 000000000000..a3cbf96df2fd
--- /dev/null
+++ b/media-sound/mpdscribble/files/mpdscribble-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch
@@ -0,0 +1,29 @@
+From 8e1cf0bc6a6d6e1636d1abe18adbf7b5a76841e0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Thu, 9 Sep 2021 14:19:01 +0200
+Subject: [PATCH 2/2] Don't install AUTHORS, COPYING, NEWS, README.rst
+
+We install these in ebuilds.
+---
+ meson.build | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index b4cc736..28ade21 100644
+--- a/meson.build
++++ b/meson.build
+@@ -128,11 +128,6 @@ executable(
+   install: true
+ )
+ 
+-install_data(
+-  'AUTHORS', 'COPYING', 'NEWS', 'README.rst',
+-  install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
+-)
+-
+ subdir('systemd')
+ 
+ subdir('doc')
+-- 
+2.32.0
+
diff --git a/media-sound/mpdscribble/files/mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch b/media-sound/mpdscribble/files/mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch
new file mode 100644
index 000000000000..9e14fdb33804
--- /dev/null
+++ b/media-sound/mpdscribble/files/mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch
@@ -0,0 +1,49 @@
+From 8bf74e12a900349cb1ac21c22065a64d09873ff2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Thu, 9 Sep 2021 13:54:15 +0200
+Subject: [PATCH 1/2] Unconditionally generate systemd unit files
+
+---
+ meson.build                | 4 +---
+ systemd/system/meson.build | 1 -
+ systemd/user/meson.build   | 1 -
+ 3 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f22b7a3..b4cc736 100644
+--- a/meson.build
++++ b/meson.build
+@@ -133,9 +133,7 @@ install_data(
+   install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
+ )
+ 
+-if libsystemd_dep.found()
+-  subdir('systemd')
+-endif
++subdir('systemd')
+ 
+ subdir('doc')
+ 
+diff --git a/systemd/system/meson.build b/systemd/system/meson.build
+index 83c5fe1..dfbdd59 100644
+--- a/systemd/system/meson.build
++++ b/systemd/system/meson.build
+@@ -7,5 +7,4 @@ configure_file(
+   input: 'mpdscribble.service.in',
+   output: 'mpdscribble.service',
+   configuration: systemd_unit_conf,
+-  install_dir: systemd_system_unit_dir,
+ )
+diff --git a/systemd/user/meson.build b/systemd/user/meson.build
+index 5372d3c..72320ee 100644
+--- a/systemd/user/meson.build
++++ b/systemd/user/meson.build
+@@ -7,5 +7,4 @@ configure_file(
+   input: 'mpdscribble.service.in',
+   output: 'mpdscribble.service',
+   configuration: systemd_unit_conf,
+-  install_dir: systemd_user_unit_dir,
+ )
+-- 
+2.32.0
+
diff --git a/media-sound/mpdscribble/mpdscribble-0.23.ebuild b/media-sound/mpdscribble/mpdscribble-0.23.ebuild
new file mode 100644
index 000000000000..09a5937e6e1f
--- /dev/null
+++ b/media-sound/mpdscribble/mpdscribble-0.23.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson systemd
+
+DESCRIPTION="An MPD client that submits information to Audioscrobbler"
+HOMEPAGE="
+	https://www.musicpd.org/clients/mpdscribble/
+	https://github.com/MusicPlayerDaemon/mpdscribble
+"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/boost
+	dev-libs/libgcrypt:=
+	media-libs/libmpdclient
+	net-misc/curl
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS COPYING NEWS README.rst )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.23-Unconditionally-generate-systemd-unit-files.patch
+	"${FILESDIR}"/${PN}-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch
+)
+
+src_install() {
+	meson_src_install
+	newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
+	keepdir /var/cache/mpdscribble
+
+	systemd_dounit "${BUILD_DIR}"/systemd/system/"${PN}".service
+	systemd_douserunit "${BUILD_DIR}"/systemd/user/"${PN}".service
+}
diff --git a/media-sound/mpdscribble/mpdscribble-9999.ebuild b/media-sound/mpdscribble/mpdscribble-9999.ebuild
deleted file mode 100644
index 639a5eb9e342..000000000000
--- a/media-sound/mpdscribble/mpdscribble-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit git-r3 autotools
-
-DESCRIPTION="An MPD client that submits information to Audioscrobbler"
-HOMEPAGE="https://www.musicpd.org/clients/mpdscribble/"
-EGIT_REPO_URI="https://github.com/MusicPlayerDaemon/mpdscribble.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+curl"
-
-RDEPEND="dev-libs/glib:2
-	media-libs/libmpdclient
-	curl? ( net-misc/curl )
-	!curl? ( net-libs/libsoup:2.4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-http-client=$(usex curl curl soup)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
-	keepdir /var/cache/mpdscribble
-}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index dea201a88632..13176df33ec0 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,5 @@
-DIST mpg123-1.28.1.tar.bz2 1066558 BLAKE2B 4516ed6cafda21aaaf132266b91ae235ca0b911a79c4514c0588c030f4f5f2f3923153729f1fc3354cb5fa982ca8dc27ba6cb58fa884da379a8913c8119e8bd2 SHA512 af1fb96878a7b57f62f06445e9b888cbecc569a91fe118459c71415f62287f9d9de9b0d0663522cb181e1a21692d64d0a810d8aebfa6e085eb76926d7a2186f9
 DIST mpg123-1.28.2.tar.bz2 1065867 BLAKE2B 2fc585598e49334b608c2a8487b40b599dc1a57afc53249975a339dbc381b968cc099d4274fb74872d3c4c54d1a6ee1858c4b00c78feb93809c823cc56398661 SHA512 45ac11c5997d13f80917e135a40d2fb4448703dad56271dfe8ce7c8dea339cbac7727ec121779040bd7a07fc4ea79086860ea4a8ec879eda3bdcbf7d57348cda
 DIST mpg123-1.29.0.tar.bz2 1068523 BLAKE2B f044dcdef62156cc34a4709d6ead71042e936d77a86386563862d54d7b18635dd378d4dcac1358228c8275d7bcef894f17432cac0519373d11d4c5f18e346728 SHA512 4261a086395f118f6723d8a3757ebcf5244359be07af634d8bf802e48524978a0974f8b17b423bbf38d262c82ac9e31e0fd5d07a735f63f5e33f58d82dc5fdaf
-EBUILD mpg123-1.28.1-r1.ebuild 2985 BLAKE2B f8336768a984ea5833a8367c5117634c8cb2df08a26dd15347198ccbc8a6ddb7af7823d2159aad3840a2c0a0f0c38a917ace673985c98bdcede043defde6066a SHA512 349beec6a8e9d9c7a2f4762760da91fc4683d956098cf7bb9b230aab601eeb1754f428fbcb141e2cb66f0c834651ad2b6ca64ceecee9b2200f8f449b6912306f
-EBUILD mpg123-1.28.2-r1.ebuild 2994 BLAKE2B bd492a7b8daae68de10d10c23aadceb89c135bbb8c4d7f1d039b4aacc4ca5174cae5f9034ee2a1036c44fb0f46dec2540151eb056b1124971470527988b1e15f SHA512 2280c59a37c5ff30fac9a0c15fae050032cc5a2bcc423c9a2944d44f0b41024e3bd12559110dd33984d8a1954df3e13ad9aa3d4cca4b9b9e0d7e3a0ad5c91e46
-EBUILD mpg123-1.29.0.ebuild 2999 BLAKE2B 49a074e953c393d80541c36a02e2ca1340937b4d844650177316b76662a2b4a47c775ff119f32ad0c65605f1daf554c6e46c985bbf83070961064479c9fea15e SHA512 359623d74681fd7401f131d63094219cb2a1e42fa2fa1a27692c48c432e1929809c5b10f9b9a6d3a97983de05ae4410f176368d39e9c269a10eac264d81447ee
+EBUILD mpg123-1.28.2-r1.ebuild 2992 BLAKE2B 4bb2cafa1ed3c1f69097a953697fe924c675b78d5117dc52d1abcd3b8a9e6fd6b694e791320c9ada6fd6852c478f3a93eb5e810323f59fdd719ec2ad829fba66 SHA512 804e99324bf8c5fbbf870307d8b243733eb09708b0c6a9a6068803f8886219169d7153789f43690e368a0c2fc2ed2ac47ebcf84a67fca035937c202abc5869a4
+EBUILD mpg123-1.29.0.ebuild 2997 BLAKE2B 9075445f0712ee679a65f97cf85cfa0a7d044898c8e2e776e251cb9970f387b8b98343b1308e57231057ec0a4d3e54b4fbfe75ce6f04ddedfb25d83af78649dd SHA512 953077d11d5ee4ed7693e2f99db8e777e48277f43beb6519d03a0f1c247a4e5e5b2046e56c586d5695d39969c873de0fae26be7529a6cf7aa52a542366e2ab40
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.28.1-r1.ebuild b/media-sound/mpg123/mpg123-1.28.1-r1.ebuild
deleted file mode 100644
index 4afe46cf0ce9..000000000000
--- a/media-sound/mpg123/mpg123-1.28.1-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-# Note: build system prefers libsdl2 > libsdl. We could in theory add both
-# but it's tricky when it comes to handling switching between them properly.
-# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
-RDEPEND="
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl2 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-IDEPEND="app-eselect/eselect-mpg123"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-
-	if $(multilib_is_native_abi) ; then
-		local flag
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use cpu_flags_ppc_altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext
-		# bug #164504
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=(
-		--with-optimization=0
-		--with-audio="${_audio}"
-		--with-default-audio=${_output}
-		--with-cpu=${_cpu}
-		--enable-network
-		$(use_enable ipv6)
-		--enable-int-quality=$(usex int-quality)
-	)
-
-	multilib_is_native_abi || myconf+=( --disable-modules )
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123/mpg123-1.28.2-r1.ebuild b/media-sound/mpg123/mpg123-1.28.2-r1.ebuild
index b4af182dace6..b49ebad52d41 100644
--- a/media-sound/mpg123/mpg123-1.28.2-r1.ebuild
+++ b/media-sound/mpg123/mpg123-1.28.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mpg123/mpg123-1.29.0.ebuild b/media-sound/mpg123/mpg123-1.29.0.ebuild
index 29a2b1f3de75..3b1cbeb24236 100644
--- a/media-sound/mpg123/mpg123-1.29.0.ebuild
+++ b/media-sound/mpg123/mpg123-1.29.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mt-daapd/files/mt-daapd.init.2 b/media-sound/mt-daapd/files/mt-daapd.init.2
index c77b7dd2bb5d..c77b7dd2bb5d 100644..100755
--- a/media-sound/mt-daapd/files/mt-daapd.init.2
+++ b/media-sound/mt-daapd/files/mt-daapd.init.2
diff --git a/media-sound/peercast/files/peercast.initd b/media-sound/peercast/files/peercast.initd
index 9739b4a31381..9739b4a31381 100644..100755
--- a/media-sound/peercast/files/peercast.initd
+++ b/media-sound/peercast/files/peercast.initd
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 79c660a5f7bf..3a5f43de1339 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,5 +1,7 @@
 AUX picard-2.6.3-fix-py3.10.patch 2720 BLAKE2B b5644f587d4ffcddeeb9594b33e75ac2b6da6c1ef613dd05183568fe8899220a021f5c2b0a58351c9670a2fdda25423da501c321cd47e5dfe88012f718bb8cba SHA512 431bb2c37322c27d04c1187828cd7b758954b83cc0078602551e3408c2f471bd6d17b1f0e1c7a2a97fd66bd6a631336615fc4ba8147b547d5ca3bce6ff58d5ac
 DIST picard-2.6.3.tar.gz 4320046 BLAKE2B ce308440ed4c6297128a5470b7bdced50fb22e62995c26670339ff71c70d610fc0c4ea8433f9dbacb197b710b8100de171817df604d76986596391d029b3c20f SHA512 71bdeb4777a0d996ac0093edefc448a348aa72e657ec639331e67257c47c389993d2715ccebf715458c3b606051154586d63b22b3cebd541d8b2da5e96a833b5
+DIST picard-2.6.4.tar.gz 4319362 BLAKE2B 78768b4a8a22c51c118ba03a9e97ba6c4bec9180e5739867b5756170083930a942a0a1ceaeb74bbe724af3ca392b92139cbc4acdde9556e9031be16a968a0240 SHA512 5f44f91f9f44cb17ecd27e204b75c83b776a2c55e2a6e42f96018c83f4073d92f028ef74006d6acbe42b1ed374543a65e177f34c561bfdf13ded1085515bf353
 EBUILD picard-2.6.3.ebuild 1511 BLAKE2B b1171f075b1be925db317d34edf8dbc5e2c1e8b635f8c3872ab4087b9fef18d29b611dd28ddb8d0fd1ddee2312c259cd0890664c6a4c7a553c117730e888820e SHA512 defd6e9e132bee27d0e9cd904c11cd57c3a3a16c255693957e7174dd81206bab3f7eff196b5b52870b5c2c23781643970e8e66de438255a0ee428671faa8c9d4
+EBUILD picard-2.6.4.ebuild 1375 BLAKE2B 531caf97f4ba0cbc7d9e8ef8b0da462b451254ec418922a9e3826025142e51092e2fc55ab78680f5ba375ae68751947508b8dd4cc38013cc2ad02d45e446476b SHA512 85f2e34de295c821a2e8d2acd332543e806a2d0070179cc0c61f1e7bf510a9fb8ec953698ade9a39354f2a21027e4d19f5d9adc1ad081e9b80e350d89d26e372
 EBUILD picard-9999.ebuild 1375 BLAKE2B 531caf97f4ba0cbc7d9e8ef8b0da462b451254ec418922a9e3826025142e51092e2fc55ab78680f5ba375ae68751947508b8dd4cc38013cc2ad02d45e446476b SHA512 85f2e34de295c821a2e8d2acd332543e806a2d0070179cc0c61f1e7bf510a9fb8ec953698ade9a39354f2a21027e4d19f5d9adc1ad081e9b80e350d89d26e372
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.6.4.ebuild b/media-sound/picard/picard-2.6.4.ebuild
new file mode 100644
index 000000000000..3b869df3541b
--- /dev/null
+++ b/media-sound/picard/picard-2.6.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/metabrainz/picard"
+	inherit git-r3
+else
+	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}"
+fi
+
+DESCRIPTION="Cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="discid fingerprints nls"
+
+BDEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/fasteners[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
+		discid? ( dev-python/python-discid[${PYTHON_USEDEP}] )
+	')
+	fingerprints? ( media-libs/chromaprint[tools] )
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 9a01b18ae669..5ac935f2d3f1 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,5 +1,7 @@
 AUX qjackctl-0.9.1-disable-git.patch 543 BLAKE2B 818b22b94d1869ca59545463382f254458d7707b33a8150fe29f607ffca72f54d599ab00904bb05b10ef61a2b461ca9c94160b257dd679fb00b0ce872298d488 SHA512 d8c01bb983df5507676433c0262e03b33e43396f421ce37761927489bd6e350dc7ec3b8fce673108ea02d5b13d2b4317dc476c43bb4e1fac14af31a2867fd570
 DIST qjackctl-0.9.4.tar.gz 1094914 BLAKE2B 61025ecd6695df877802180a95763e5e9d557bc1d36966454cae2638fc5b5439c1ce64b65cd0193e40fd461575a3223b5ef5132905b7d211b75292dbfd5b7299 SHA512 ce808242d8bacadf4e267bdf75c20b53601f54c8a4eb0b5116653afa7bcdd17e99ac4f878d4ec78844194e13623a804850cf8ea7e12430806caad4fe986115c7
+DIST qjackctl-0.9.5.tar.gz 1336079 BLAKE2B 3446b0cb5cd34541d5761f3f6e2361dcfb50656997c723b5972aa60466a1eb1a720fb5d97684079832705b084d8d1ca082f652145d51ff89aedfab71a90d5c5e SHA512 2edceefd30a57b3b2277db271dd95c2b47b4a85106762eb3149dff94328265c096c5a26d301bd0edcd8f5d948dfc24ff2d3da532ac297121e4fee6982fb6ba56
 EBUILD qjackctl-0.9.4.ebuild 976 BLAKE2B 197d8a0e50b89ea30322d304ac0393d99166aa2abbe5252ef1a99fc7bc855812559b96311fdce3df05f2a6f5466acbebe06d3fb5f94e197f3290f93cfb92760c SHA512 2ec96bb1ac655ba00f8f7f0ecff8341d1572bbcbd55361547907fc792d8b6bcb283f2548c6d9514b4799bd1159f51ba5a00277bb805a802bc2a848353f4892af
+EBUILD qjackctl-0.9.5.ebuild 978 BLAKE2B 3e2107aef51bac45a53f2a5701a08f32c385626e93ac22b7f5b5657e2a62305b4eea241ae8a8afda524f7b5a339929924da74d79a5f2b6f5cb0a079126f63832 SHA512 e9c90266c949e5edd0b37ce436ae870cbc193aafd96b55658b44084c404243a8e5e7f782bf74900d48e225e1a6af6745a75651e98cd0ab4cd844d854a04d9e3c
 EBUILD qjackctl-9999.ebuild 920 BLAKE2B 33a4fb30c5fa508b6ff4a09c46d275b00b667fcbfcea612e02f1131e30afc0686515c5bbc29e8bc8bca114352d96f71c5ef086c64e31bf1a65958702f5df8b59 SHA512 a43bec74f96732cc57a86579662fb9ce524340fe3284a66a4c4c5c0e1333363a0eeadf7f04c77dbc16befb605ace0ece9e82e9c4a6fed185073adf3b3cfbc4cd
 MISC metadata.xml 338 BLAKE2B 74efc1853779388695ea14b6ccbe8e22d88941b8fcb845f553c02bd9e052f5638b2f4629dd238272a20b76db17f0d1f30a454a4b9a27333eb1e80b8d826c0dfd SHA512 bf18f336710191bc34b33b34f3f39435a9f3c9d7c45cef4e5b0ad39c19f4a9b27ee032dd2dbf6c57daaa90ad5f9adce40c49230850b6c1d746d0691eaf5ebb10
diff --git a/media-sound/qjackctl/qjackctl-0.9.5.ebuild b/media-sound/qjackctl/qjackctl-0.9.5.ebuild
new file mode 100644
index 000000000000..15137741a070
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.9.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="https://qjackctl.sourceforge.io/"
+SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus debug portaudio"
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.1-disable-git.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
+		-DCONFIG_DBUS=$(usex dbus 1 0)
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index 3697aa032654..5a82c72ced77 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -4,5 +4,5 @@ AUX snapclient.initd 381 BLAKE2B defa09df346dac279f1ed903adaf88842b060b34d774cfd
 AUX snapserver.confd 1010 BLAKE2B 9d29348f1618dd399c5a9c500d1ec89fd6719243f472dbb666cfa16e6128411a83c9ac9401a1754b79ae4b560643d1f38c3f00f6f6d0a2301ad6e3fa2168c884 SHA512 98818d75e965d54082b33fa36769b74810b3137f07693eac00d10313c3716e72170e9148faa0ac25fefc7868bb7a206ac5ca6d18396fa71d1a74efcc14485548
 AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d66179fc952b636296ee1b1d151a90d8774ad419cd7ec982305da3da3ddda43d55f5ad47c45d98adb72649 SHA512 d8f6b72d1a5be5f2ddd9266fac33b6d24b046993c532f204e68824919ed09f41988923a59ba722c3c9c748b87c1fdda1c91026f8e591993f34188ef3c488f379
 DIST snapcast-0.25.0.tar.gz 1412827 BLAKE2B 54d0c7b4fd20ec7d7ea414ed9915da9458c0875e5ca0277ba9c4d1415d50b0ef5940530ede3a09fe7d6bb94c7b17c7d0c6194105aa88a9719506f7494e79c723 SHA512 bc5e0540574f96a73971bae4b185a96f8ce0ca6619a51d9418368cf19f1e5b5248052a3a1e8922a15ba6b54dc8c3234c2f800fa2951fa5e97b9dd5610f78419d
-EBUILD snapcast-0.25.0.ebuild 1597 BLAKE2B 97b6451e8b2708b5936a8463d71a87c191eb44ab4acff9a9cdd19e0c06ebe473ef7c64a03cdc5885dc411b954208eb1aad0cae49be4911519bc6d007a9712d9b SHA512 0d59b65a21d4ef66fec2f53dc3173bfc79f8e12a6c788c9442a914133b4f6d4c5ec35d2a31f458ec08a5d867146f230b026be4b452a486c992d21ba43b163cbf
+EBUILD snapcast-0.25.0-r1.ebuild 1615 BLAKE2B 353a5da75f77cd596d6a7de6f52052e71b30a107a3bf80d96f0b5357db09620c71003d355c50febf71a121817d2a494112c4256f18d131c106f1e3a729578bfe SHA512 4d4ac542e367d2c460f80e8e6c26124865385bb6640172ffa318137508e745b32beec7635c4954df27c94a2df3e9dffe8fbf5972f64e61dc9b71ab8e5416c651
 MISC metadata.xml 1040 BLAKE2B 5a5296b35eeae6e07b8b8c3dc3d63b58fb2d1aff7c0977f87690b9228183624c9d21fb2699aa82fef1d6027ff2cd89cb7a282cfa2c2ea0683f9da5a728fff17c SHA512 ac97766f2fe178adf1d6f642c60fab45be05e9b0509f34a270cb970ab16b3596ea90fc16b25d94b6457ff7c3543d4b88e5d291c62079ecc6b9d9e730fedc6250
diff --git a/media-sound/snapcast/snapcast-0.25.0.ebuild b/media-sound/snapcast/snapcast-0.25.0-r1.ebuild
index b27a764a85cf..093e6dafcf79 100644
--- a/media-sound/snapcast/snapcast-0.25.0.ebuild
+++ b/media-sound/snapcast/snapcast-0.25.0-r1.ebuild
@@ -16,6 +16,7 @@ IUSE="+client +expat +flac +opus +server tremor +vorbis +zeroconf"
 REQUIRED_USE="|| ( server client )"
 
 RDEPEND="
+	dev-libs/boost:=
 	client? (
 		acct-user/snapclient
 		media-libs/alsa-lib
diff --git a/media-sound/spotify-tray/Manifest b/media-sound/spotify-tray/Manifest
index 6fbe914f73a3..121882b06cc6 100644
--- a/media-sound/spotify-tray/Manifest
+++ b/media-sound/spotify-tray/Manifest
@@ -1,3 +1,3 @@
 DIST spotify-tray-1.3.2.tar.gz 22298 BLAKE2B da1399db3d42d969d983b9bae695ff55dbdff47ef49ac79e10e2681df45489505028901a0946dd70495a6a74b9eef979f9ef07a722a08cb93a2ba6749c106f4a SHA512 74ae5ebaa61497a0274646dad04d408bb4176bbbacbb0e80211bec9218d09e293c8abf4c9424de8123ba4440d63adb58c5b68ca53690d2e348d52efbbc3f88c1
-EBUILD spotify-tray-1.3.2.ebuild 617 BLAKE2B 1432cf1f86e45e202469cd5a5bb667705f6e762ac8be11787624b426ece6ff0f0e00dbcb4ebc4fd234c78ad296a2c0fbd5f7e70702e6abc36847491dd8b97c2a SHA512 063603de63effcab6223b13378c5ff781e78b0cb9a9e70dcbf0c6a75a5483e33cab5c199e8bfd6fbb8ecca5efde50275bcff5e4f3598e4a99da49a632ea2310a
+EBUILD spotify-tray-1.3.2.ebuild 728 BLAKE2B 747b2ba0c7a48ce5b67fc452411e5db9a225e42be303754d99be12189e5b46c171978b103e85f66003b1fb7d63ca56775dd4ce3745ac93aacfe4103658f4b657 SHA512 8256d9238a0c2a8e63e2ce7a729744bd7e31c9048baa9348798747d3da47563d124c11bb6a80adf05a4d098e2322c40f0737fcca6323067ee68ac3fc38d6f4b3
 MISC metadata.xml 414 BLAKE2B ee33f5f467b025c775feaa293e883034769a1018a5907cc52e2914f54d2da159bcaa2b543bdcb5c29a0735d8a7644de030b3eed8be24b386f53a10a3169bc058 SHA512 c7ae1301aa33cbc2da3b283aa0f0a8cd29848875e999549e0500934d2de7c06e061e5b3cef036b3a804c77248828789f231bf06710715db9e491206fd4adbcdc
diff --git a/media-sound/spotify-tray/spotify-tray-1.3.2.ebuild b/media-sound/spotify-tray/spotify-tray-1.3.2.ebuild
index 28d534d9a35d..5de180e44e4e 100644
--- a/media-sound/spotify-tray/spotify-tray-1.3.2.ebuild
+++ b/media-sound/spotify-tray/spotify-tray-1.3.2.ebuild
@@ -22,6 +22,9 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	default
+	# Fix error: AM_INIT_AUTOMAKE expanded multiple times
+	sed -i -e '/^AM_INIT_AUTOMAKE$/d' configure.ac || die
+
 	# Fix the name of the icon
 	sed -i -e 's/Icon=spotify/Icon=spotify-client/g' spotify-tray.desktop.in || die
 	eautoreconf