gentoo resync : 17.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
commit: 463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree: 9aa75eefc5154eaf0e3c33658b830fc54dc68052 /media-sound
parent: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)
53 files changed, 65 insertions, 577 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 46176062720a..bbb684ebfc3e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 04a54cbabad3..01539fcf018e 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,4 +1,4 @@
 DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7 SHA512 28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a
-EBUILD ardour-6.5-r1.ebuild 4774 BLAKE2B 632b2adbc2108046f8ad9b210a2871ce6c07ca12dd88d8f3927dfbf860c520f3e3d6be4c6454ed64bb4a1540d080fc53109ccb5e04275620216ff89c5e4769dc SHA512 cf6a3715bb7ec939339adc440390e4b0777624b4c5ae0e46ddfe63fbd973c30856bc34e77cd09dea36517b6b715abc7d253eef5ca12b7b85374fbbd1228241f2
-EBUILD ardour-9999.ebuild 4776 BLAKE2B 22c2d2600952492e72fbbb81ba06ebd0fde5323a0960f6eef0eead944bfdb47df3dbbcd3d87eabe143537d0c9351771a925eefd34704c0c6a93172ffb45ecdc6 SHA512 e7a5779fdf2931d6aa28902e1da0067dbc32159808caec856784a7ab86542737b0256f51601d9b45872e7db62bcaadb95942e291b5afa0ec4185b8c810d3c6bd
+EBUILD ardour-6.5-r2.ebuild 4776 BLAKE2B 957265c747d35808bca1f4bb55e8aea7228bb5f4f2cc36d2516a990114924f2fb48160af3343125ad241d4d7796aabe0ae22e1da12933ee35d7362330d3dc331 SHA512 f8d58d2858d18860cfd129f617dc730ffa64491a3f4c3eafced05015e15720602b362c7e100c29d7514b0c47cf3d1419bee87ddd14fb5ab224a530c6dc3b6a04
+EBUILD ardour-9999.ebuild 4778 BLAKE2B 5c90551cb095d55ac3853dc718893e10b1b554aa8341b5aa482e13ec6efc8b06229d9a44f6b02c83f22dbc0b0e114256fcc2f9e3004ef33ac2be55bcd6084ef5 SHA512 e625d9899ed2e852abd2fc3f0de8cd95967bca076eaa9a21e737e6f864d6f8d98e3126f02753f68bf096cbfa21e0b22898190b16a5800ff1c0125738848bb95e
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.5-r1.ebuild b/media-sound/ardour/ardour-6.5-r2.ebuild
index 7a6e537e5639..8db68c8d6a82 100644
--- a/media-sound/ardour/ardour-6.5-r1.ebuild
+++ b/media-sound/ardour/ardour-6.5-r2.ebuild
@@ -24,7 +24,7 @@ SLOT="6"
 IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
-	dev-cpp/glibmm
+	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:2.4
 	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 9cc16d9c4dac..9d4f2f8cc5ae 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ SLOT="6"
 IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
-	dev-cpp/glibmm
+	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:2.4
 	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=
diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest
index 4fd87c0e9366..4f3710472dae 100644
--- a/media-sound/bristol/Manifest
+++ b/media-sound/bristol/Manifest
@@ -3,5 +3,5 @@ AUX bristol-0.60.11-dontcompress.patch 576 BLAKE2B 78f5629897a3ae3380f5e64ccce6f
 AUX bristol-0.60.11-implicit-dec.patch 320 BLAKE2B 8fef42ab74f5f6777c86774a7f7c8092b20d8c596ab2118fd862bc32e0f3fa55ceee488cc88d4599f22b4b373d67c2af3ea189f3508e30564ffc71acb5e812a1 SHA512 50a59747c75a8843b06fc412c65d724d8f205be1c6d9d5c0aa0d38c57f0f1401634dd301b531f8a28ca43f3804727d9ded82e6fa49abd5372fc8e70f87f5b341
 AUX bristol-0.60.11-rm_alsa-iatomic.h.patch 967 BLAKE2B 9da2f53f06e4db83c5fe280e3253c70a83e052304c9e5adcd6e64956c81ea7bfd9eaf1dd5d639aca581c16bb446140fcef591753b3325aa0f700ed3a8649f1db SHA512 a86aefdcb1a6431bce94dc062b4f3e73332196fc71a154c8d171991cd61b3694958229c5d329245e098976732f03f75516dd7521d887b822bd6441e66a1bd64a
 DIST bristol-0.60.11.tar.gz 4218697 BLAKE2B f981b3d54e763092539ff631cbb48c06846a1fdde79db385a904d1af280ffd1520c88cbcfdc7f3d504cc65bde35c55f804545eed5ccac14b1ab17b1dce3e184e SHA512 2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180
-EBUILD bristol-0.60.11-r1.ebuild 1232 BLAKE2B 90c97989a7c3fe0bbac01e06292b22a368b99c0821bf8e570cf9244518388d577d6009ae2298789aae967b3eb2ec6181344466185146a8bd79e642b5372d4885 SHA512 443c4c99ceb2cb4972df4317917d57220f4d30e809994a21c34883ab8fe52b7b0e4b89cf4fdde33605a0716ccb5d0f2caeebf742db0372598e94b64bf678b6d6
+EBUILD bristol-0.60.11-r2.ebuild 1174 BLAKE2B 93f1e15dc42aff36b40d2d10d6e9b143a4efff9ce5b40d92ee4a90339a396b01756152e2735b7f05d5c6976be98e6fc147d04a27056c0980332389e27fe468a2 SHA512 a85e2434d5c7b42f1d8fd34286c5eec3ce000b5687320726f602786bb2871953125ab03144f87a38dcbe644e7601da643cd15613ebd16845dd57f02edcbc9e09
 MISC metadata.xml 599 BLAKE2B fa41cf25b04bb687587a736332f3b66a63a52d13c0371b64aaf8c7d12515df8ac9b15c3e70687b6cd8157b493a65992f2e8a1a96db12cd372215b9791b46fc7d SHA512 ca1be472e9a1dce6e55d3313e9b11f0839fbb321c5b662ebf4a9aca0915d10b15cbe3aee3629b285886e84b53f8c7d0c65613e58be32d5d98f04360b368da1ba
diff --git a/media-sound/bristol/bristol-0.60.11-r1.ebuild b/media-sound/bristol/bristol-0.60.11-r2.ebuild
index a98b921d23de..e5481dc9adb8 100644
--- a/media-sound/bristol/bristol-0.60.11-r1.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r2.ebuild
@@ -12,25 +12,20 @@ SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="alsa oss static-libs"
+IUSE="alsa oss"
 # osc : configure option but no code it seems...
 # jack: fails to build if disabled
 # pulseaudio: not fully supported
 
 BDEPEND="
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
 RDEPEND="
 	virtual/jack
 	x11-libs/libX11
-	alsa? ( media-libs/alsa-lib )
-"
+	alsa? ( media-libs/alsa-lib )"
 # osc? ( >=media-libs/liblo-0.22 )
 DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
+	x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cflags.patch
@@ -45,12 +40,12 @@ src_prepare() {
 }
 
 src_configure() {
-	add-flags -fcommon
+	append-cflags -fcommon
 	econf \
+		--disable-static \
 		--disable-version-check \
 		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable static-libs static)
+		$(use_enable oss)
 }
 
 src_compile() {
@@ -59,5 +54,7 @@ src_compile() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	dodoc HOWTO
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index b8b848915624..fa8abc3a53a2 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,5 +1,5 @@
 AUX clementine-1.4.0_rc1-QPainterPath_include.patch 1395 BLAKE2B e95d24a03e8a7ce2ff2465d37615a1b7a5ce2d435af4795a7e22f3550807dd939f21993b3c2fd69318326ab4a07ce9a8125177958d0e5ac307cead3a707db5c5 SHA512 ca8125e10712d06ffdbb28311eca33c914dff0fc34e1edc8be4b06778443d4097aad86315360e9915bcb6829f70e33c652ff0745754e02ef4e44860660beac54
 DIST clementine-1.4.0rc1.tar.xz 5593564 BLAKE2B 894d86903df1ba43fca2f07c83d92bcb5d65a0103a4ecd1b321d44259534930c977f0caeaf0c93446dbec4422937f2ddc7f665daa7cb41e5c183fa7f16571809 SHA512 c74102a3ca4a99c3627b718389478e5ca79ba71ce45eccd232ca2eb3fb60a1632afa62908a2831244d6c35154ad6a8b4fa2b2485b4440b9685a0521bfacaabdb
-EBUILD clementine-1.4.0_rc1.ebuild 4910 BLAKE2B 86767f3e3e0758e16ad8bc91e4fe835d2f900693771b27fdaa78dcebd3680267124b7d723603744a6b1a1ba9a612eba626a987edd4dd88a4e331539530a4e538 SHA512 50e3fa664ca01d8f07e7fe26e3f7b0707c33574a4fdd66a26c1eec456087bd85d3c7d3721185b2adcb1084b3890427a3c4012cfc8f84722fd5f7a63bf9ee41e1
+EBUILD clementine-1.4.0_rc1.ebuild 4917 BLAKE2B 9232e336c94c4e0cfcb2b9240890cc790d69edb4c1ea35df7ec8b0b8469f3a322bacc867612991f9fa3a16fe447d4f54a5572bbb3d267d8299c2e4ba8188431a SHA512 8756bb1915b72f201eeddb5a214127ad6eb2a9342e5a7077011b1a8c3047c65c8d5979ac92aa60a4446150b6dfafb077ae8184210da8fe9eba325d754efb88f3
 EBUILD clementine-9999.ebuild 4820 BLAKE2B 2fe724b22cc8b7b60e6b71a82fc39c9975e722690905b223f19d910f35ddcd238987dfd5a6cebc63169ee952cd1214e68e1e11768ff281b0ae230a11d0eaf373 SHA512 969c6a71948ce2d59b3074fbe481853ef269168f59a1f9dc74cc1f4cf1508b6c6b726f0b64e4f8c55fdbab14f6c3201064be4033aa4641afd9b1fa53f621a495
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.4.0_rc1.ebuild b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
index a11ddaa0a213..ef72ab5c0af0 100644
--- a/media-sound/clementine/clementine-1.4.0_rc1.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ else
 	else
 		SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz"
 	fi
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
 HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
index 46c8ec431e31..5ec8edc49eca 100644
--- a/media-sound/gmusicbrowser/Manifest
+++ b/media-sound/gmusicbrowser/Manifest
@@ -1,4 +1,4 @@
 DIST gmusicbrowser-1.1.15_p20190315.tar.gz 1306390 BLAKE2B e74a3ce80e031c64e381e226d2905ebc5e6826758e984edaf6ad71b414438091f21eb068ce248f3a954bdac34d3027f88a36abaea07265904a5ae40a8da01bf5 SHA512 d9d92c670724daf3ccec5445bcafa9616a8995d1416c0d1a671a42ea14c4d74c4475546e45bb55c6c5015ecf770ed4a7cf1a0e8801d281096818758483c14e2e
-EBUILD gmusicbrowser-1.1.15_p20190315.ebuild 1460 BLAKE2B 61d893f39f746a5b747f161f25a42b836794938a7c11ff7e06bc60e5613cd002d4b914bfc95420aadc3f9dd65af31dc3ecdeb2df566927527fbed7e4d53cc5ff SHA512 d4a5ae531738f10d6c955937dfc5508d02e40630fad0817d7ee17f4b7710c7a7a9ce09075e8bbd41d19c9f3bc5aa25497f77601a0dda02f0d3e1991ad43c3f74
-EBUILD gmusicbrowser-9999.ebuild 1453 BLAKE2B 8350e2a87669cbc53ff9aa29860d2ffc876ac28e9454bb0b023382870a570bd0832d1099466c4e3c88f63173b58e40e9515124c574c0e34074cead10c3d34077 SHA512 1a6bca106241c1361228586cf13b229d2cfc34cf27f993ac1872e0e60675673f7ca68998266d747b6675e147b7391bd0d411ccbafde6af067358d8d2e54c6a92
+EBUILD gmusicbrowser-1.1.15_p20190315.ebuild 1438 BLAKE2B 42055af696aefcdcfe264353563f87544e52c041383954d0f90b0546a5efd82b88059961dfab2d4e39eda855d3e9fc1bfda803d372ac65273c0d814527bdfec6 SHA512 a1c8bd62631f1e28c8e6511a8a63a919d15845cfb35beb5ac4da32e787b44b169e5d92df1b1b18f533b6801fb3301d48e39eda6342692b6dfb4c5930076c933a
+EBUILD gmusicbrowser-9999.ebuild 1440 BLAKE2B 8d1611f9509e0e4404a2277afb900a8e071f3c35038d1c3e930a92e39577b7d745edd1d71132ac3e990e14f6d8211b1a613de6bd6c8eaf1d8d5a5e82fa65667b SHA512 acf5251d8a414ce24afa2abaacd5e3c0dce043efc0f0b8027f21ab0762f490941a4eaa143a7f6ff67504cd8c5834e9b948fbbf28a8019d00154e211084c4eb3b
 MISC metadata.xml 348 BLAKE2B b91fd147f7a4d685c51832b198e6508db2e62e5529168b9a27b78d0bb9bc2924a3e8a0ae182117882001631b028f28803082c3069f4a9bcd2d4ecc77279b3987 SHA512 a4c9a19bbcf91e47cfb0bc72bce2d01f4dc32f8ad34f0a430f98faa5822092aee3d139a06b7d8e8986553100bcab03194ca49e602371bdf2a1dba6d090dc9912
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
index ae1b59c0d9a5..000cfbc2d608 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
-	KEYWORDS="amd64 x86"
 else
 	GIT_COMMIT="4538a5af5fb6c11f07bd7a9c50d6fd73b18c840d"
 	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
index e3ecb295b17b..6813cf60326b 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
-	KEYWORDS=""
 else
 	GIT_COMMIT="4538a5af5fb6c11f07bd7a9c50d6fd73b18c840d"
 	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
diff --git a/media-sound/guayadeque/Manifest b/media-sound/guayadeque/Manifest
index 4ab1d4bf0ee8..8faf8ff246f7 100644
--- a/media-sound/guayadeque/Manifest
+++ b/media-sound/guayadeque/Manifest
@@ -3,5 +3,5 @@ AUX guayadeque-0.4.6-gcc10.patch 2981 BLAKE2B a925446bca10a9f96a0babe889d151cc49
 AUX guayadeque-0.4.6-metadata.patch 716 BLAKE2B 2dfd57e859eebfb174b6e66c3b9f11cad4af49a3ad615f1f6e53d7cd86c4e9851c8d7d78ba47ed1785cd2eab4017bc43720e9b3dbf4990d06165355c505fba32 SHA512 5d3d861eebaa629031de6186846353798b7178801d6b7c07344bf75d952891d17f90237986949bc4b12984b8635ae4d1f9fc8a319d2199bd6f22cc7669dcc564
 DIST guayadeque-0.4.6.tar.gz 2074965 BLAKE2B a6076a60f6560f51f1fa1ac7aca0529823d6579726049cfda212ae42e62c6f86ca18e8c06aa60d8e23c8accf51d4363ebe4b69b50ce5224f7db3215c32acf12f SHA512 d353aa492b393a5043cdab2d151d715381c3d9d50cad393ca5687b5c556257641fc2b5eda53772098c8c0621fba88ae693179d07a1085d5b69aab1e5d06459a7
 EBUILD guayadeque-0.4.6.ebuild 2356 BLAKE2B b7b8c58c38fad216bd73f236cf7797b49e8ff19b1aedf7291a5ff9a6b8db31dbb5c36153b3c5b86ab1f42ac3a8e83968d95b572325d5e9395c16986c3b62c9d7 SHA512 c0b9aef324c9e370e5262c1ba8e0c3efa08c103eeec067bda9dbb69e4cf33794c6fbb6ff931423c5b9e6f30875a8e3cb17ca3df800cbb0b618eaab14de1ec266
-EBUILD guayadeque-9999.ebuild 2282 BLAKE2B f785e50bc117afb1baa8076399c26d12a8afd75564745c966e87ad8b5d1696b4b0eb56f881c932b9680871aa60104b5bcb86d6ad2c8b9bd90b7389b1b3d1d77b SHA512 f9b444bef5266a22cef7bc802a1ef36317b2ad21a0a9801ef63f8a477c573cf5788fb0c8f89fd3dc765129f7c714bf1d55733ad0270f4d93996901c24e549bb0
+EBUILD guayadeque-9999.ebuild 2269 BLAKE2B 91638edf51c355d60f39c3548efe82cdba79e1a0dbc8d98d09f2e341a8069982adcc761fc6b60f44dbba00884de831c85b971efaae12f9835cd832810187f053 SHA512 2c4ae18463836d9671797971f671f32895d28bbcd95f8e6b88d4a2932ab6435a6a0c1bd4992d9b702343b1285421414b00a5c58981598031c6e384321f88ef58
 MISC metadata.xml 410 BLAKE2B d61d13faa8d5bb87bf8ef99b6841a4a05091db82d5961c69d5d922782d091639aff1919f843a92da39ee7181dcd1a8d94d63b83b9c80f1c17cc6c55fc79bf985 SHA512 826a540e373fdbe9027eb0bf9f66a6e7fd61c1b355a5b0cdbc00e2517e3b2e1b23224e6f0bc6025553c49135f4851422ff2055a2c681c9d42fa11f2fab905f3c
diff --git a/media-sound/guayadeque/guayadeque-9999.ebuild b/media-sound/guayadeque/guayadeque-9999.ebuild
index 2578fcf2e894..5da351601454 100644
--- a/media-sound/guayadeque/guayadeque-9999.ebuild
+++ b/media-sound/guayadeque/guayadeque-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI=${EGIT_REPO_URI:-https://github.com/anonbeat/guayadeque}
 	EGIT_BRANCH=${EGIT_BRANCH:-master}
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/anonbeat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index ff07accbde1d..1d2fd87a8d92 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,6 +1,6 @@
 AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
 AUX hydrogen-9999-gnuinstalldirs.patch 1879 BLAKE2B bf1563cbedc0b3a6d2aefcfe6bbf1bfd7f44ea26456d18889d684763f9af8170aeacc5887182ea845093c5187e92da51298dcb44bd99d6c2f0c5a47adbe5ba7d SHA512 20cc8970301192c967866f27b344591a58747a3a501eaa1b5d92dfb82af48e98f5c9e4c7908084f2845d258f323cec0ec42b578797b1bc3447c9b1918cbbdaea
 DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c SHA512 66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
-EBUILD hydrogen-1.0.1.ebuild 2111 BLAKE2B 115614e67d1001f2af423710998ee7340838baee2cf67c4289edbdf0ab5ff4423721c2923a7f66b71087ba917dd00c6ca022ca3ce3e69e5fdd7f359701653697 SHA512 c91594162fc4787dfcbafac06985fc2be98370ec773c6284ebe9b822dadb45e70db7ffb66a198653b441e05c42eb7b9b1fb15d12c30c4feca8d59d6b9519e65b
-EBUILD hydrogen-9999.ebuild 2090 BLAKE2B 196825b644e659eb72da75ceb97293dfc84014fed26c85df7fe0960409ea3de9df7704ef66480befa4f71619697be4ae892dbd6105ccbec5542f82aac9776b88 SHA512 582742d6990b81e662c315f71012db91df51c1a6b274e0e831b3bdd89d0cfc605192e9d36a7ee5b04c423309735721c0cb3079e457148db1898d1a58dcc2f0c6
+EBUILD hydrogen-1.0.1.ebuild 2079 BLAKE2B 6edfa53c9d4609d76dd0923dbe9f726f25ba14d7eae18c1b1a1735a3b7bc630912a4a0ab45d6e961ff0b43a09ed35ed2adca11486df531db93a771bc4d2fa06e SHA512 2337df146265eeba5c1f5216e14d6d487a97493f316e95a671c54765279768b70acd46da7ad4bccff8076b97f999f458de72c7014bc21c6c9ec893b1ca0693c0
+EBUILD hydrogen-9999.ebuild 2077 BLAKE2B d44f7d81977b4b8a755c0aca634bd6c6da2f7199c59f21928efd606bf3c12912fc2f1861e06725e80ee2bd849a6a366c78e039629cd25ef9e7454799f663f893 SHA512 8e8eea2232f41416685151de940dbdf634491ea3c36315816430a75b38a92c2a05fc4f4e12f8d8d4454d50a2ea37c3d88b6f059e0c4c256faff457d04a669f4e
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/hydrogen-1.0.1.ebuild b/media-sound/hydrogen/hydrogen-1.0.1.ebuild
index 86ef3e86fe01..5b62655b32e1 100644
--- a/media-sound/hydrogen/hydrogen-1.0.1.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ HOMEPAGE="http://www.hydrogen-music.org/"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-	KEYWORDS="amd64 ppc ppc64 x86"
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index aa141dadf063..8a3c0ad28c9a 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ HOMEPAGE="http://www.hydrogen-music.org/"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-	KEYWORDS=""
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 89ddad07c9c5..f11ef595f527 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,11 +1,9 @@
 AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e
 AUX lilypond-2.21.1-fix-font-size.patch 505 BLAKE2B 33f98803eea6a87082a9c724bb88ea6fc9493f97856f8c581f28c786010ce215a6626970eec602d8d311ec5e84f5485cf7a3cfd3fdc1099c8096ca5af28aeae6 SHA512 a59c00e4f2c44797e4e7656bc7f097b644399a211c691c8ca1502dfbdc0806ce9efbc24644675b2d246f585b74a17bd1895a5bb830fe10cda2e6dc7c0846848c
 AUX lilypond-2.23.0-fix-font-size.patch 573 BLAKE2B a9b9fe5249b76a92aa6c0f8e4c0002f03785225e081b07d4ab34db459bd8d241b97051273846dd9efee4536e00b37fd0a064302d05b537069e17b6dff834a1b9 SHA512 523e5d1ddf68c07715e791ed9367c836010603369f14ee22ce7ab2979131be1c066dabdd66a942ed9b098c3f535577dded0bb0e1e48c35754d7f9c455d4911f5
-DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7
 DIST lilypond-2.22.0.tar.gz 18023031 BLAKE2B a7512629be43680c6e6bda1404c9b8e4a9bfb0b65ad565aede9dba983ae8e5fb350e8a53250cd01314b4d032d1bbe7b391bb3acd411dc6665868f4cd04f15011 SHA512 4dcc4da1bd1aa1d10ca802acbe29f2256587cd8e2643651b6d2e42cfce0b9572d0eb1139fbc59cec98ad6b86b86e7a6910becb6be7a4350ee0adfe366daa0a65
 DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d
-EBUILD lilypond-2.21.6.ebuild 3259 BLAKE2B 2cb854d7b37cafe41bba0a32e0a121f6c1c40ae7da0dfa1d61018ecef07d430a5055b12fa57fbf7e23dbcdedfe3e9d5fed3d42fd035ebd8bdd1fa1b53edc02f8 SHA512 e62aa41a9a884abef1f0ae028c3816aa5c51b5c3699a8f723b049bb70a0449c42d4ee120edad5c932be18c17892946003b2762627c63aa343a7d96525f88ef55
-EBUILD lilypond-2.22.0.ebuild 3260 BLAKE2B ed1441a62347c2467baf6efbc35b973c280cb366d1e154ff06c88acfea301701c15b74a548be5e9beb8ded96d5b6ec425b664601ef4ca578c469443814640df9 SHA512 8b34f3617757e4a445f978e5ad7cae30577b8315442ee8a8421b0165bb476883fa2385a93363a5ab72bad119628f355e4efa793ab9c2a7af129c42b960a41fd8
+EBUILD lilypond-2.22.0.ebuild 3259 BLAKE2B 2cb854d7b37cafe41bba0a32e0a121f6c1c40ae7da0dfa1d61018ecef07d430a5055b12fa57fbf7e23dbcdedfe3e9d5fed3d42fd035ebd8bdd1fa1b53edc02f8 SHA512 e62aa41a9a884abef1f0ae028c3816aa5c51b5c3699a8f723b049bb70a0449c42d4ee120edad5c932be18c17892946003b2762627c63aa343a7d96525f88ef55
 EBUILD lilypond-2.23.0.ebuild 3125 BLAKE2B 09cd1233322c01a66ab269587e26e749d6cadaa59850cf9d43a1871ff83abe7c055bb6b3af9217025787ac39fb72cf19139d0cdeebaaa1ed6ebac68e8e3162f6 SHA512 05e6f86c0e9a077593ef291d7100f6d483ae38840675490abba3035b054ee66f48ec861db8d15723fa5f37b19445f5b1155517c2ed4bcc158c2504c2e0380fa2
 EBUILD lilypond-9999.ebuild 3133 BLAKE2B 0654eabc0c866033058b8acc79534507eaceff26722308b80a8fa813bd11f1dcfa403ef9a5630eda9c4bed42c45598b77cd3cdef19509dcf7720df482ec2b272 SHA512 df015a49fdc4eace7530a6443e71a051b1739ab09ba75f36b44081b794b99ab29a636b686fd05dd12de55ce8860befa1ee0f20903314cf408cfaf08154868e36
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/lilypond-2.21.6.ebuild b/media-sound/lilypond/lilypond-2.21.6.ebuild
deleted file mode 100644
index 4b0263ccad91..000000000000
--- a/media-sound/lilypond/lilypond-2.21.6.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
-else
-	MAIN_VER=$(ver_cut 1-2)
-	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa x86"
-fi
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-SLOT="0"
-LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh"
-IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}"
-unset LANG_USE
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-texlive/texlive-metapost
-	sys-apps/texinfo
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-"
-RDEPEND="app-text/ghostscript-gpl
-	dev-scheme/guile:12=[deprecated,regex]
-	media-fonts/tex-gyre
-	media-libs/fontconfig
-	media-libs/freetype:2
-	x11-libs/pango
-	emacs? ( >=app-editors/emacs-23.1:* )
-	guile2? ( >=dev-scheme/guile-2.2:12 )
-	!guile2? (
-		dev-scheme/guile:12=[deprecated,regex]
-		<dev-scheme/guile-2.0:12
-	)
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/t1utils
-	dev-lang/perl
-	dev-libs/kpathsea
-	media-gfx/fontforge[png,python]
-	sys-devel/gettext
-	doc? (
-		dev-texlive/texlive-langcyrillic
-		l10n_cs? ( dev-texlive/texlive-xetex )
-		l10n_ja? ( dev-texlive/texlive-langjapanese )
-		l10n_zh? ( dev-texlive/texlive-langchinese )
-	)
-"
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
-)
-
-DOCS=( DEDICATION HACKING README.md ROADMAP )
-
-src_prepare() {
-	default
-
-	if ! use vim-syntax ; then
-		sed -i 's/vim//' GNUmakefile.in || die
-	fi
-
-	# respect CFLAGS
-	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
-
-	# remove bundled texinfo file (fixes bug #448560)
-	rm tex/texinfo.tex || die
-
-	eautoreconf
-
-	xdg_environment_reset #586592
-}
-
-src_configure() {
-	# fix hardcoded `ar`
-	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
-
-	local myeconfargs=(
-		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--disable-optimising
-		--disable-pipe
-		$(use_enable debug debugging)
-		$(use_enable doc documentation)
-		$(use_enable profile profiling)
-	)
-
-	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
-
-	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
-}
-
-src_compile() {
-	default
-
-	use doc && emake LANGS="${L10N}" doc info
-
-	if use emacs ; then
-		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
-			|| die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
-
-	use doc && emake DESTDIR="${D}" install-doc
-
-	# remove elisp files since they are in the wrong directory
-	rm -r "${ED}"/usr/share/emacs || die
-
-	if use emacs ; then
-		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-	fi
-
-	python_fix_shebang "${ED}"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/media-sound/lilypond/lilypond-2.22.0.ebuild b/media-sound/lilypond/lilypond-2.22.0.ebuild
index 5214b122e904..4b0263ccad91 100644
--- a/media-sound/lilypond/lilypond-2.22.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.22.0.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = "9999" ]]; then
 else
 	MAIN_VER=$(ver_cut 1-2)
 	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/media-sound/marrie/Manifest b/media-sound/marrie/Manifest
index a47b2f3ee8a8..196e448f7af3 100644
--- a/media-sound/marrie/Manifest
+++ b/media-sound/marrie/Manifest
@@ -1,4 +1,4 @@
 DIST marrie-0.4.tar.gz 7775 BLAKE2B 7b68fbdfe35c7e72fe111b44bbabf4e60eb9f6211867184d1f3f7bc7b1c067f99223eea2dd3c7809f041d0a7b5ac80be360d3c14808605f3145b8d39a0a9c7fd SHA512 9ed8677729e7575519f130c1866923e7223dabf07c9c24b9e3f6a70cd5e1e56da2a5d1a34011b73d65c8d8fa4c962f65709883b9444d078d6439769d4afb644b
-EBUILD marrie-0.4.ebuild 887 BLAKE2B 2ae1f54eb7fd9080f7738e89a311271d5944ba87a80d121924048fcdacca7c7f8908800c8dc97eb1ab75e0a009d59a7e3ae0753a355f9fc1936b15f92b3133aa SHA512 30c775ef0f49884ccbde36ce0274c413453219c8df82299640998600febb996d8ec392d2af1f954a8d39362527d7cf81d54a7487d676e75f0afc329439691b10
-EBUILD marrie-9999.ebuild 887 BLAKE2B 2ae1f54eb7fd9080f7738e89a311271d5944ba87a80d121924048fcdacca7c7f8908800c8dc97eb1ab75e0a009d59a7e3ae0753a355f9fc1936b15f92b3133aa SHA512 30c775ef0f49884ccbde36ce0274c413453219c8df82299640998600febb996d8ec392d2af1f954a8d39362527d7cf81d54a7487d676e75f0afc329439691b10
+EBUILD marrie-0.4.ebuild 880 BLAKE2B 4791ea7a320c067abae8dcae04cf46f4e5b4d59a279a099528d177cd0b34e55c38d712a8b095d19c1d904a741aa434bf07857c01ee261740aeaf6da1985ee1c5 SHA512 e56680d489ef2bcef3044b4ff7c189183d90626091d44851ce7a4d76bc451309267781d467e47736556f0f0096d660b21d07897fc7e0f0e91a3956e4fac45103
+EBUILD marrie-9999.ebuild 880 BLAKE2B 4791ea7a320c067abae8dcae04cf46f4e5b4d59a279a099528d177cd0b34e55c38d712a8b095d19c1d904a741aa434bf07857c01ee261740aeaf6da1985ee1c5 SHA512 e56680d489ef2bcef3044b4ff7c189183d90626091d44851ce7a4d76bc451309267781d467e47736556f0f0096d660b21d07897fc7e0f0e91a3956e4fac45103
 MISC metadata.xml 479 BLAKE2B 0ddc1860004de05f492636bd0a7b57e683ee07be026a4b5509d4e2c959e4a9d6b3114fec0dc5ffdc958f8b4359fcb9ad09156f2b20a23f5613a308949746827d SHA512 e4df2008d83fe62532c1a1b03d4058aa7d4f7b67024aaf34d5c5d76aaf32baf01f56d90c5864fb4b3787f3828addbd75fba79b4dfb63149bd4eb3e046ad0ce87
diff --git a/media-sound/marrie/marrie-0.4.ebuild b/media-sound/marrie/marrie-0.4.ebuild
index 9db908a1dc6d..5e26f9cf5c9b 100644
--- a/media-sound/marrie/marrie-0.4.ebuild
+++ b/media-sound/marrie/marrie-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,10 +18,10 @@ DESCRIPTION="A simple podcast client that runs on the Command Line Interface"
 HOMEPAGE="https://github.com/rafaelmartins/marrie"
 
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
-	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/media-sound/marrie/marrie-9999.ebuild b/media-sound/marrie/marrie-9999.ebuild
index 9db908a1dc6d..5e26f9cf5c9b 100644
--- a/media-sound/marrie/marrie-9999.ebuild
+++ b/media-sound/marrie/marrie-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,10 +18,10 @@ DESCRIPTION="A simple podcast client that runs on the Command Line Interface"
 HOMEPAGE="https://github.com/rafaelmartins/marrie"
 
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
-	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 9e1fdf2d5f4f..9370afcd8536 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,6 @@
 DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
 EBUILD mumble-1.3.3.ebuild 3814 BLAKE2B f59c05d68a56cee5f840d6991718bf10cee2fe10bd70d78eeea5a87aea4ddf545c96807ccc52bb1c01615348695cdc166d94ebc6dd651042c0945337621f37a3 SHA512 7d7d42d1ce7b90b4f25522f4ea71696218b2b8c4addfc8f8c927ecfabf1493ab08d811136b24bfaeb708928d3b6e733e0f40c65103cc11ed87071e04bec12577
-EBUILD mumble-1.3.4.ebuild 3816 BLAKE2B b938985537d3d3f569e9774a1005d27425c25b9e26e02117c5f9923106ef872753623010d1d7d30e51fff0900097b930aab35a8cb66fa3f8caf675a297164c1e SHA512 a69a2279b3f939eb8c53ad523a20d9993d01c09f5096289da8327fb9b92e536351d604929f497e2f3a312e69308da3f45a87d580bc541e38e1a44710f5324e2c
+EBUILD mumble-1.3.4.ebuild 3814 BLAKE2B 56c5fc62d9117dd41d82de5b027f1e5250ff117813dbb745f84e4f4d4327d9ee4c6d1bc0f377f16e9939750de877c3ab11ec19b3f55797efa025e04da8a12ca8 SHA512 2019d8ccaa70a7d9a3979d52b794e7ab6b8a9dc14a8efc88e4a79b1bd1fb14e0458efd3a7dcf5a8d1b6c13b2e5770304c70d120c5e413f0782612b234c127c61
 EBUILD mumble-9999.ebuild 3043 BLAKE2B f6e699e41a172ce1b816cde9b30e021b0ea15579a29bed4037d272c65d0859dce1dfa4a2e14275c85a47cc6e2b11e39d62302df993bb48d85983fc20205c98b0 SHA512 5a643584e6202916ed620a899d77fb59088026ef96a0420e4bde721a68ee68174827b29dd776ea35274a89af6bb0645e9792fa1e8a39acf5efb3363f7bced9b6
 MISC metadata.xml 596 BLAKE2B cfea5947f1ae0ed91141892278fb374619e4dcf17664e63f76fd61b60f75341534a7a6ad1602959b700696996ff46b6cf12eb2a652b1079f331f66e3dc4ad4e1 SHA512 aeeb4a05ebda91abcbc0ae8a52840d815d251d9c329a1cb06c7baf150eda8a4d0e10697569bef0adfb3a17eb2c59bd6b5d3db7e2c9c50c69f0e52e341fff454f
diff --git a/media-sound/mumble/mumble-1.3.4.ebuild b/media-sound/mumble/mumble-1.3.4.ebuild
index 327b8d715c81..f7d3f495222f 100644
--- a/media-sound/mumble/mumble-1.3.4.ebuild
+++ b/media-sound/mumble/mumble-1.3.4.ebuild
@@ -21,7 +21,7 @@ else
 			https://dl.mumble.info/${MY_P}.tar.gz"
 		S="${WORKDIR}/${P/_*}"
 	fi
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="BSD MIT"
diff --git a/media-sound/paprefs/Manifest b/media-sound/paprefs/Manifest
index a9b319d0bc7c..0896946ec35e 100644
--- a/media-sound/paprefs/Manifest
+++ b/media-sound/paprefs/Manifest
@@ -1,3 +1,3 @@
 DIST paprefs-1.1.tar.xz 69144 BLAKE2B 9809bb73156be1e4020679637c1203524a0ccc5f5e1fb3696724925bb196cd397e433c22e993e7353cfaadd38260980676af6ace2cac795c0b615298d1d85805 SHA512 4203fcb485b40223a5c8672fdbbd2875a25d05d85366773015728f54a17020098ee9e9fd1c02180c01799e100b99389c970855fc1bd69921d32d8e43c749ce76
-EBUILD paprefs-1.1.ebuild 945 BLAKE2B 7607bc874caf102f46827a5a51ded94ffda45a367729d44c2d25faecedce9a97d4a0f19b117adcc48aefd995ffa309384d617e7ee7adf9e8dd64f656c15562fe SHA512 2c0657ddf7f98b3382e8f5549f8a0b8224ff9a0c627954c70ff183ad4da7728d58429b19b121f8542b19809af0a6be19832e288cad288d616529d0e479ea06e5
+EBUILD paprefs-1.1-r1.ebuild 939 BLAKE2B e392fae53c00d30b07e9dbe843c360edde26cce313b78f9b96b00e2aaf63924c0a5aec2029dde26da8434b32b14112721b91e2fec036b2acfe76d68bea7b697e SHA512 e8fe1c5cc828753144974db389296a9e58ec38ea6101aef5b0d426f711860bf121cf2d3ea82289ad7d432dc279b698deadab158854d472997c02a20ad76f6764
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/paprefs/paprefs-1.1.ebuild b/media-sound/paprefs/paprefs-1.1-r1.ebuild
index 7c72a37b0939..fcf064732a0d 100644
--- a/media-sound/paprefs/paprefs-1.1.ebuild
+++ b/media-sound/paprefs/paprefs-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,9 +11,8 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
 
-RDEPEND="dev-cpp/atkmm
+RDEPEND="dev-cpp/atkmm:0
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0
 	dev-libs/glib:2
diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
index 29b54336ad7c..790a609edc97 100644
--- a/media-sound/pulseaudio-modules-bt/Manifest
+++ b/media-sound/pulseaudio-modules-bt/Manifest
@@ -1,7 +1,5 @@
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-DIST pulseaudio-modules-bt-1.3.tar.gz 85802 BLAKE2B ea7e5141d07c1d3b19372cbae2aa9a5b6049509a12bb2470f47f231f85cc66ef4a74e70bdc91d3554d57e9c26b64129f87b2a3a55e16fbf0c6fe1b5ce7721074 SHA512 094c4205c1c71326efd42053a1bc9f131633c9e28fde177f1c08a290395864b76b8f60f79ffec2fbb8445186aa5c85aafabc47908fd302beb5b278ebcac98558
 DIST pulseaudio-modules-bt-1.4.tar.gz 87558 BLAKE2B 98b21d8fced5b88d59e45ca4fa2505d3606616a8a09dd95eb91e30b0d31c8a0ec7e52e4c2fd1b601130f69a997871064849fa0c8847ec0686fb42a2ccd7ac43b SHA512 390b6ad0931b464a546c6624bec38cc5b6da7084e4defe2045f4164b0c910a9dd6d4327466eb0e53fcfbc78c995cf2e3634a75b67ee2a14f38ed18e31b5d2bce
-EBUILD pulseaudio-modules-bt-1.3-r2.ebuild 2228 BLAKE2B 8c21f34108dfcc888e92784ea0d8e648214b1ba3abf78265e9ed501d03fcdb473a0543c5c93c02028e5d00c36b654e237fc9ce5d362b13f1933e2ef6f25802a3 SHA512 65166145c85b9337d75e3b1cb1ea75cd68945aa0859d092a6373b9dd610de641ecfe92abd9182949e11f8d4027b0487458e85f91178b76c47c81e6df890df411
 EBUILD pulseaudio-modules-bt-1.4.ebuild 2194 BLAKE2B 389cd211299f30b3fa4634bcdec0eb6f1b7152bede7558bcd516b1a80d05a8cdebddfc0904cfffd233eccae54292bf75d5a85ddc7ba335c87bdd1f932390e32f SHA512 a34e4f1956670b72b80712c49dfab5325cb916594e71a9f7c4fc0eedbe8a318a427f12947a771ed83ec065dbbd1deb69b49e366ead93c5f3e817de92e564e550
 EBUILD pulseaudio-modules-bt-9999.ebuild 2063 BLAKE2B b45bfc09796b5c9614ec159ab0f79481009b850aecfe840c94789ac32fd8eac21e9143e2959bfbe1f6e099cf106e4edbbc2dac1f8137ff80d6dbbfc016f8b8fb SHA512 1003a535a6a01464f85ca06cfe9eb20519ed78e0855bc86afc16634f4e3582976738b4d333bf41efcfacde7c8733b363f8cd42dd314468dfa7a0f9ac9cf2c993
 MISC metadata.xml 766 BLAKE2B 3fc16e24b2ecb5212c32ada629f2e8c19c91921333db4de169f0848b6bc63b2001c8e68d7c82765e064f8ecbed10e25bc926ea7c598c09d88d5e474df63ab9bb SHA512 c14a460ddba2b09ecddd6a5f12ca8a888b22bac2b9f606249d466473bde3e6ae5c64ee899e74c5ca10c3708d9a39874dfcbbce84c3ccc383c274ac8cfbde43bc
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r2.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r2.ebuild
deleted file mode 100644
index f46c7072e9c9..000000000000
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils readme.gentoo-r1
-
-DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth"
-HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
-
-PULSE_VER="13.0"
-SRC_URI="
-	https://github.com/EHfive/pulseaudio-modules-bt/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PULSE_VER}.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
-
-DEPEND="
-	fdk? ( media-libs/fdk-aac:0= )
-	ffmpeg? ( media-video/ffmpeg )
-	media-libs/sbc
-	ldac? ( media-libs/libldac )
-	>=net-wireless/bluez-5
-	>=sys-apps/dbus-1.0.0
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	>=media-sound/pulseaudio-${PULSE_VER}[-bluetooth]
-"
-# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-DISABLE_AUTOFORMATTING="no"
-DOC_CONTENTS="
-After getting media-sound/pulseaudio merged without its bluetooth
-support (to not collide with this) you may have removed the loading
-of bluetooth modules in default.pa config file, leading to failure
-to use your bluetooth device (see
-https://github.com/EHfive/pulseaudio-modules-bt/issues/33).
-Please ensure you have this lines present in your /etc/pulse/default.pa
-file:
-
-.ifexists module-bluetooth-policy.so
-load-module module-bluetooth-policy
-.endif
-
-.ifexists module-bluetooth-discover.so
-load-module module-bluetooth-discover
-.endif
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
-		-DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
-		-DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
-		-DCODEC_LDAC=$(usex ldac "ON" "OFF")
-		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
-		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
-	)
-	cmake-utils_src_configure
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# pulseaudio headers needed to build
-	rmdir pa/ || die
-	ln -s ../pulseaudio-${PULSE_VER}/ pa || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 80a790cb8e24..f9bb7441c97a 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,6 +4,6 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-EBUILD pulseaudio-13.0-r1.ebuild 11356 BLAKE2B 6ddc1176aeb259c55607e4202fe1d8a0aa98e2d805e1fa5245f3f709effa5810cee07b438fbaade15cdf8d12c654290b50327f607bdbd4b1ef4d195a1822e30c SHA512 6d1a8c0e0f8d98f73c12c6f60a3dcd38417f83d8efeff0da1c0030404e859b7b25b4276d92359b63c7ac2f8d73eb9df20d580668ce07fde63a7f728d5cd559ef
+EBUILD pulseaudio-13.0-r1.ebuild 11355 BLAKE2B e9c69cc1a5a41ecd9823ac1810b54baaf12688adf518b57a55ada96c6c711c253598217f1714cf45913cb3223db06945a48c31af5dadceddb8d601c2eb2a51b1 SHA512 1c43399841da40068a8b943ba3e024bb03de56174deeb07e3154c4ac815afaaaf16db0bc6c5fabea637ea7ef48be0974203dcfc78d1de6a87cc41a62fdadd9dc
 EBUILD pulseaudio-13.0.ebuild 11572 BLAKE2B 1cbf83260874c9af3f16942054fd3f6d49740c45efc917e1df0794bb5d7e39d69cec65eb56954dcf6e6f83c430f4bd65aef1ba07e94c5be8874c5179a082526c SHA512 98e9336312c8f9e2d6f0c715d22d3cfa193ffd6a8cf6e05da03756dfaf9be6aa05293f5554d4d923ad67d7eaeab9718343d156873db62997a97e1dec445de019
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
index cdefa5223e0b..265a1ec32060 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 928dea1f8bb1..f760153e937a 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -2,8 +2,8 @@ AUX patch-4.7.2-gcc10.patch 1083 BLAKE2B 216c71658161024a8ea8992813f5627ee39d540
 DIST pulseeffects-4.7.2.tar.gz 1998420 BLAKE2B 6ac9d4b416ffac73f874fafcfd07b990ead7a2645832fd35eae23b3c9e9acb8663718b9cbb5fd0c1066c1f75272d0473257e711602d2646742785fe2c6ca5ea9 SHA512 f235504ca6edddf7a18f2c909ba58578a3d70e6fdab5ad0882f831c9d148f4fd35d0e55617305d787feefdba7a7544e1a72dac3dbc0e03bb9183e0937cdeaef2
 DIST pulseeffects-4.8.4.tar.gz 2029971 BLAKE2B 6be45e748bd8df238391107531f46ac706fc9eb535c78c06f32526d910dffb82bec36af4130490645c95b200562c51f59f19de8905c3c54bda5d8a4b68b5297a SHA512 4d68f5bd678c75f5b13519cddb2f46bd0a827516f1cc7431a8952204f51bd2691f701df869258092a93843bcdb4c61bac916291bade8c4428ed9a4d68b70c757
 DIST pulseeffects-5.0.0.tar.gz 2030440 BLAKE2B 3d68f48ea6beeee308cc82dd3aa10a242587d2c5fdacdb89cf2618ae6ea537966e33e0c9454fab0258c64d05fa71ad196d462097d2abeae1e57a1bf1e7d89ef4 SHA512 f43e1ad22d243689b94d840dd71046079ff806a42606184918e2a28bc6a287d40e709a43abc51e4ea5ea36e99963db43486206a122cc89fe533afe1f9ee54e2f
-EBUILD pulseeffects-4.7.2-r1.ebuild 1903 BLAKE2B 50882416becc1e4545bcef6dcf5a245465064aa11b876ff4191d79bcd8e0723fc01d05b76f5d4fb6930f2a330edb4644d4a0b63ad1083c589e7e93c400494a3d SHA512 1726d0a7c5135c9423c4d85613d4b3b90854452e25a51ca2ada570d9c502d923eb4ddf89c481dccb4ba12f4583f5b42d74efc7b0e59833fc104452d468c003bd
-EBUILD pulseeffects-4.8.4.ebuild 1809 BLAKE2B 5494b4f6321de6d23d53b03c53d4c13af32506bc8590cdf1a19f81686f25657e507a8e7d798927fb7bf0644524c207bfe987a7a8f6a3aa7051a722aebac0a774 SHA512 3753055c7e014dab2b9bf5584e859a55232382e9cb447f0ec1488e9d387c1ccce21ed1b0d4a59ad3eaea46419cee31fd77fffdcb44f0c425ddeb3b28e47a3958
-EBUILD pulseeffects-5.0.0.ebuild 2130 BLAKE2B 0a3ca49fb2abd6bde8d608c7688908780204d248031801dd8a19d7c6a9029be81f691419ff821a672f4daac699cb962b047750ded4ab81d74e6521df3382b91a SHA512 82a3cd700903aa4959bf284a4c9ce29a684106384023185de5addaaa8f99b38b4f30bffd5229982e7c9ab26f134033c5e9b7435d26d908b863735467f1d099f2
-EBUILD pulseeffects-9999.ebuild 2130 BLAKE2B 0a3ca49fb2abd6bde8d608c7688908780204d248031801dd8a19d7c6a9029be81f691419ff821a672f4daac699cb962b047750ded4ab81d74e6521df3382b91a SHA512 82a3cd700903aa4959bf284a4c9ce29a684106384023185de5addaaa8f99b38b4f30bffd5229982e7c9ab26f134033c5e9b7435d26d908b863735467f1d099f2
+EBUILD pulseeffects-4.7.2-r2.ebuild 1905 BLAKE2B 61eaf56d327b9f99b1e337cbbb316e8c191ac6d316929a9ac4049985a421ecbdba229ccd61d773412be3f5eebdcb39fbe121f64e268a4aab0157ec61b9eaa669 SHA512 3fd3c448f9716f943e4c1f5a679f2a0b242e725ec2a8ee11efaa3d98e396d7e7d0bf9d0954eec0276d0df38f781230cafba3d7b34cd9272c6e0d0a67341c2a36
+EBUILD pulseeffects-4.8.4-r1.ebuild 1811 BLAKE2B 58e33cd0dfc818d9ec00fc9b9bb6a48b4eec41262a3904282d770a5d8ed4649a08d9103778e4ebfa6c90e890fe9159dacd0b44634d9024226bb807d63f990607 SHA512 9c7721f01c43a462d9a152423e247f76fe9fd0cffdbbabb4990cfb04436f62369fd490dcf5f41a7e0f2bea83015ebf01fda36303eae5caa8c43e8b2bb037e42d
+EBUILD pulseeffects-5.0.0-r1.ebuild 2132 BLAKE2B a02bde7457326d0dc5702cbcc497c59c966a405254406733cae0535424c4010a7e373ba276d4cee455ff57f6d27d602f0f0518ace3224a1bf24f54abb13c756e SHA512 3140a48ca65adbe8549fdda9750ec97cd34c40a8d1f12b2ac1e9d37a8cc7f751e01b0fccac4455995f932ef42395114ed16cbe37dd5b3c2b9688597d7d5e4b5e
+EBUILD pulseeffects-9999.ebuild 2132 BLAKE2B a02bde7457326d0dc5702cbcc497c59c966a405254406733cae0535424c4010a7e373ba276d4cee455ff57f6d27d602f0f0518ace3224a1bf24f54abb13c756e SHA512 3140a48ca65adbe8549fdda9750ec97cd34c40a8d1f12b2ac1e9d37a8cc7f751e01b0fccac4455995f932ef42395114ed16cbe37dd5b3c2b9688597d7d5e4b5e
 MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1
diff --git a/media-sound/pulseeffects/pulseeffects-4.7.2-r1.ebuild b/media-sound/pulseeffects/pulseeffects-4.7.2-r2.ebuild
index b12d12b7438a..6f046476075a 100644
--- a/media-sound/pulseeffects/pulseeffects-4.7.2-r1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.7.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ IUSE="bs2b calf mda-lv2 rubberband"
 #TODO: optional : lilv, zam-plugins (check from archlinux pkg)
 RDEPEND="
 	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/glibmm-2.56.0:2
 	>=dev-cpp/gtkmm-3.20:3.0
 	>=dev-libs/glib-2.56:2
 	>=dev-libs/libsigc++-2.10:2
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.4.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.4-r1.ebuild
index 2da1d6c26e68..42ea432b44db 100644
--- a/media-sound/pulseeffects/pulseeffects-4.8.4.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ IUSE="bs2b calf rubberband"
 #TODO: optional : lilv, zam-plugins (check from archlinux pkg)
 RDEPEND="
 	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/glibmm-2.56.0:2
 	>=dev-cpp/gtkmm-3.24:3.0
 	>=dev-libs/glib-2.56:2
 	>=dev-libs/libsigc++-2.10:2
diff --git a/media-sound/pulseeffects/pulseeffects-5.0.0.ebuild b/media-sound/pulseeffects/pulseeffects-5.0.0-r1.ebuild
index 434a705868eb..8915be106aa2 100644
--- a/media-sound/pulseeffects/pulseeffects-5.0.0.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-5.0.0-r1.ebuild
@@ -24,7 +24,7 @@ IUSE="bs2b calf rubberband"
 #TODO: optional : lilv, zam-plugins (check from archlinux pkg)
 RDEPEND="
 	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/glibmm-2.56.0:2
 	>=dev-cpp/gtkmm-3.24:3.0
 	>=dev-libs/glib-2.56:2
 	>=dev-libs/libsigc++-2.10:2
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index 434a705868eb..8915be106aa2 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -24,7 +24,7 @@ IUSE="bs2b calf rubberband"
 #TODO: optional : lilv, zam-plugins (check from archlinux pkg)
 RDEPEND="
 	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/glibmm-2.56.0:2
 	>=dev-cpp/gtkmm-3.24:3.0
 	>=dev-libs/glib-2.56:2
 	>=dev-libs/libsigc++-2.10:2
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index d3db848358f1..f9c3679422b5 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,9 +1,8 @@
 AUX qsampler-0.6.3-Makefile.patch 515 BLAKE2B b12882524ac5e0500a6c07804ed8b50ae085ac14873b723ca4ec2a71797da76711c5516ca0f6866994a1172d3f19ae671009d270be4429850e8bff0893044123 SHA512 0d49e0d178e638cddd69677c064368b5e6dc214c173286c3f6f82b1c469a875559bb25538ed8433d4e842d98418d344dc349ac454239983006b7cd4f195b1751
 AUX qsampler-0.9.1-cmake-no-git.patch 543 BLAKE2B db45bba7c2f5e7d3325340568a1163627dc909192bc7721436b34216cdc2672c1134f817367a8783810412e909c6934a45f730f7623787b6819a88cfacd5aa0d SHA512 e5e55ca07bf38627d45a7761027fb49dfb4736b59ad0ad5441bcf1c51fef3678ddb4a6974d6febd2e74fed90a6535d0f4dcd80b4b587b2087c3ec3d1ed18ae3e
-AUX qsampler-9999-Makefile.patch 701 BLAKE2B cc95a22d6e003d3b25993e2068e2101684a85da1b8ac47c35ae330dcebd9f72ab3cc2931f1ec840d484c3f1871c0991ab90d45e1744de9fabcec293a3e260f28 SHA512 7f582fa7103d77f79c14671551ffe9ce83ac4ac0a12ee76f5fd63a670d5838af6a2b7718b8de27946b8e1234081b7316fbc4837a94ceb28063797027f54cddb3
 DIST qsampler-0.6.3.tar.gz 284613 BLAKE2B a4ef67014578b4eb7b6f6e7b5da94b04253a40bed0cc413acfde62f4660d2e1d3485d301637d1871e7f20dcdac34ea81511738a4455f8690f40460d7ea4db72b SHA512 55fe16d5cfe0245cfedb228d448235997160471343191cf204347bb13c260be747a06fce2344b36a60c5877f89b32b0f4ac4861ed8a3d555d4cc798f21f5e1ae
 DIST qsampler-0.9.1.tar.gz 283857 BLAKE2B 5d30c64edd4c1792d9e87453af45363ebdac6707ef6f804dc867b4eb23fdd657bbf554cd706ddcaa0c6bbe35deeaa1c8d1ff0f1e5af3cad005ebed94f43fed7d SHA512 5afda874b01ed576522898e04f9d264fccd589da292659eb9947786d3642c80d41629fd5d2268caa53f3ae0a96f0a1c84600a3651e8758d39d5c0220a9bba57d
 EBUILD qsampler-0.6.3.ebuild 999 BLAKE2B 3799e7cf4eb2c7695e532e3e2dbb8790a8715937d74108f4a83367d4a885d965e9f3b2f2beba21b0ca587ba6219f30022807b887a260666e461e22a2580eb03f SHA512 2818e544b0b51e87812f60d0bf02a6033faff016ef2e0ed6574dbc599786329b0fa5ad637def0b1cb1787ac8ee17a39e3c40398ed2e22a8580a9e72473702493
-EBUILD qsampler-0.9.1.ebuild 1155 BLAKE2B fdb2104d86549c6dd02d2d242e7851b5104ce5808f36183dff15f08444450ea1d1783c27df205c05b3e440f0e3205094fda77fae1f7281050170d17b211528d6 SHA512 a118819b0e2072251b97f31c59b405b5e56a64dcf6ded3b403591df196d67e923ef6e6bf25bfc089ee7801c271b66e2a431c80ffbe0c45718ff14ab6270e8c17
-EBUILD qsampler-9999.ebuild 1103 BLAKE2B 384a679252d732ce1c88792f6296c48fd9d0b086334b2c801be560969d574586491d60f1902f72eaad41196cbecec0964aeb3fb0ecc4239fa3cba2c601f1c74e SHA512 7c4891824ff700f25cab9311a1c9db7688978fc72d1155c87db31f1a12ce6837c2b66707d649b19ea5463a98575b212915b7d98e693e08fe55418adfe4f1bace
+EBUILD qsampler-0.9.1.ebuild 1143 BLAKE2B cfb8b164c0601860b65d8cf4eea8e92b59e2271c82e2efc408870d946985b880673f6e12891af7a6c8f9f7b567fc854dbc4778674a3b8e0230458ff841050fde SHA512 b166baf3141b9bcd92eb6b069fcf25501d60a84f97e0e70c7fce81d7104d370662fb5f35ae6666da258a2435fdd61b45b38a5cb3863ae64d585b1b867bffb80d
+EBUILD qsampler-9999.ebuild 1091 BLAKE2B 0e70c9b8c857bcffd4619e31f8610a4a6d7728ea06319cbf0d25fdf9e6ed7b6b9707f2fe61d73a3d04ea24ea567695137da8f62c0c908c6e1378c336bcb7523e SHA512 0afda6467ac557df22f6988d7150d6eca07e51f98848f7188b1fbcb78bb87c2e02bfad01f1e96a4961904f66ad1f950c20d8529c8882da7cdc9622325ac28220
 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd
diff --git a/media-sound/qsampler/files/qsampler-9999-Makefile.patch b/media-sound/qsampler/files/qsampler-9999-Makefile.patch
deleted file mode 100644
index 29788b0fd35b..000000000000
--- a/media-sound/qsampler/files/qsampler-9999-Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index e683df9..5c2d4f0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -111,10 +111,8 @@ install:	$(target) translations_lrelease $(name).1
- 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
- 	@install -v -m 0644 $(name).1 $(DESTDIR)$(mandir)/man1/$(name).1
--	@gzip -nvf $(DESTDIR)$(mandir)/man1/$(name).1
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/fr/man1
- 	@install -v -m 0644 $(name).fr.1 $(DESTDIR)$(mandir)/fr/man1/$(name).1
--	@gzip -nvf $(DESTDIR)$(mandir)/fr/man1/$(name).1
- 
- uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/media-sound/qsampler/qsampler-0.9.1.ebuild b/media-sound/qsampler/qsampler-0.9.1.ebuild
index d2d0dd804cbe..c515df058379 100644
--- a/media-sound/qsampler/qsampler-0.9.1.ebuild
+++ b/media-sound/qsampler/qsampler-0.9.1.ebuild
@@ -18,7 +18,6 @@ HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug +libgig"
 
 DEPEND="
diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index cd513200a60b..3fa9e7942e40 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -18,7 +18,6 @@ HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug +libgig"
 
 DEPEND="
diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
index e62306d02cf7..f61729420c24 100644
--- a/media-sound/sc2mpd/Manifest
+++ b/media-sound/sc2mpd/Manifest
@@ -1,8 +1,3 @@
-AUX ohnet.makefile.patch 1233 BLAKE2B 1a877c58ec3b37c96dd4ea3830159de8bc3c34cd99223881baf73792569301a3eb82ce5c51e2c943773a4b2a491affa9228994e05d358a674a313b6fe3f14d3f SHA512 d2b99fa95403139a2b79ac4eacd0a1a8581c1a72271a6ae15fa7c3a241ebe58cccdf6a85bba602ace9f572c217f5bf1f01b95a12ad4395b42d4738243dee1b89
-AUX ohnet.optionparser.patch 449 BLAKE2B 55133d193ebb7dc249f71ad8d249b22569c03456e0ad687e3af27e88ed0502e134b8e70128cae4fe1d92b503e52f94c8d567159fca9ff6133f99b25c791044f9 SHA512 fe723ee9f734b5ae3a5d1a2ee3c0cb22b887d154314cc776253d14adff20de86d51a8563ba1dfb2b0f37a9c77e24277d961c45941e23a644f2769a17d050d665
-AUX ohnetgenerated.commonmk.patch 1473 BLAKE2B 6d2d8497fcd7e4e9e0f2210fc24308eab4559f8974f3e6f2d6e39163a54fb7b848455d496b0191e7260c83dc27bdb96e0f1bcbaa124165b3de603b22e5adabea SHA512 a9b6b8e2d23ca661c7590fb55c34b02a248fb4b95b843e4d87fd11ec08b360fcc386d7738fd3a6433bec22cdaaa81932b81342c19d99ac5673dcfb6c29215c9f
-AUX ohnetgenerated.makefile.patch 1138 BLAKE2B a65ff04a64c64ad86625f635990615271a206cb4657fb7eef423a0b04d1718b113eaab0aa57b1b52f7235ec8a1f41dcd6a8f2e949ae45336dd1c55380a19f791 SHA512 4bcd0e5044fd89a51a9be29f2f445f59292a8b36a249f09a74aa9a7ff215b6359be8a526e1ddf9b1c7fab56f6e2453afe5841b543552fe3abf78ce5c84b25e9c
-AUX sc2mpd-1.1.5-werror.patch 4448 BLAKE2B d41c363b6db9ab7b3170e7adf6ebd9e72d94d8e708ecc5a273765ba922b8098f7f706a2245b9f23f8146d253d6c7ad2ac00b28199eb8609be6af121b42c32150 SHA512 ea7805a2a572bd8995418115ea5c256a6897d787dbacc7d31482b39672c78b3b25bc087acb6cf1d0945bacaebed4112e1de19e9484e556978c6c851dac2cac30
 AUX sc2mpd-1.1.7-python.patch 4186 BLAKE2B 8037ab9b33d25a65ec4b72b616de23c8ab12f3e93d6fe3b607039b0ad3f69f3aa37d6e7b39dc0b91767b953307464c7bd9066dc8210ef2a4c3090ad01ece220c SHA512 45b17410a6499cefd7b596c08e5fee288f16a3057e1c84da96e6388132a2fb56060f2010b65ffa38cbef0d179f8fe1c6f88da9d355f177e5524ca674bbdf0b75
 AUX sc2mpd-1.1.7-werror.patch 4237 BLAKE2B f3922de425df679e9b9e7c5249994a39e9fcda6a539f1b3d084ece8f44c8e81546b975375ca3fd8d0e81504bb712791bc99e1aa139d422805ef7dd16d79d8f16 SHA512 28d6ca71fc41ed11fab780f48861f04b28d853240107db2eed6911f3e58710e50e31bbc3f3d5c047599c1d1e544a921bc4ea4bc37e5900a02a4092c7de520fe5
 DIST openhome-sc2-20200704.tar.gz 22352681 BLAKE2B a5131f3b5c3400ff0ca58f0ce9b45c25db6fc13dcf6827ed9e4531effd3b35026d59495adf690ba65c09624c12f7755b9373ec4e4309de73f17fdeb866beeba7 SHA512 04586fbfd8053c7f01d2c3dbf421f75d0d93ac179cf5f58bc7966d364a3477a87985a1a2db1b35018aa5193a07977b7b4be60d317e7c10b275234adf9a2bd5d2
diff --git a/media-sound/sc2mpd/files/ohnet.makefile.patch b/media-sound/sc2mpd/files/ohnet.makefile.patch
deleted file mode 100644
index 29a29bcc9bb5..000000000000
--- a/media-sound/sc2mpd/files/ohnet.makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 29f2d6a..038b05e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -82,12 +82,19 @@ else
-     ifneq (,$(findstring arm,$(gcc_machine)))
-         ifneq (,$(findstring linux-gnueabihf,$(gcc_machine)))
-             detected_openhome_architecture = armhf
-+        else ifneq (,$(findstring armv7hl,$(gcc_machine)))
-+            # cubox: armv7hl-redhat-linux-gnueabi
-+            detected_openhome_architecture = armhf
-         else ifeq (${detected_openhome_system},Qnap)
-             detected_openhome_architecture = x19
-         else
-             detected_openhome_architecture = armel
-         endif
-     endif
-+    ifneq (,$(findstring aarch64,$(gcc_machine)))
-+      # odroid64: aarch64-linux-gnu
-+      detected_openhome_architecture = arm64
-+    endif
-     ifneq (,$(findstring i686,$(gcc_machine)))
-       detected_openhome_architecture = x86
-     endif
-@@ -375,6 +382,10 @@ mkdir = mkdir -p
- rmdir = rm -rf
- uset4 = no
- 
-+# This avoids errors in Generated/Devices.mak (they apparently have no
-+# consequences anyway because we use make native_only=yes)
-+t4 = echo
-+
- ifeq ($(managed_only), yes)
- build_targets_base = make_obj_dir ohNet.net.dll CpProxyDotNetAssemblies DvDeviceDotNetAssemblies
- else
diff --git a/media-sound/sc2mpd/files/ohnet.optionparser.patch b/media-sound/sc2mpd/files/ohnet.optionparser.patch
deleted file mode 100644
index a31657684271..000000000000
--- a/media-sound/sc2mpd/files/ohnet.optionparser.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/OpenHome/TestFramework/OptionParser.cpp b/OpenHome/TestFramework/OptionParser.cpp
-index fe90233..644fc0b 100644
---- a/OpenHome/TestFramework/OptionParser.cpp
-+++ b/OpenHome/TestFramework/OptionParser.cpp
-@@ -282,6 +282,6 @@ void OptionParser::SetUsage(const TChar* aUsage)
- {
-     delete iUsage;
-     iUsage = NULL;
--    iUsage = new TChar[strlen(iUsage)];
-+    iUsage = new TChar[strlen(aUsage)];
-     (void)strcpy(iUsage, aUsage);
- }
diff --git a/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch b/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch
deleted file mode 100644
index a4f28f9a7009..000000000000
--- a/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u ./Common.mak ../../openhome/ohNetGenerated/Common.mak
---- ./Common.mak	2017-09-19 10:51:13.000000000 +0200
-+++ ./Common.mak	2017-09-19 13:21:25.984071432 +0200
-@@ -17,20 +17,6 @@
- $(objdir)ohnet-generated.jar : CpProxyJavaClasses DvDeviceJavaClasses
- 	$(jar) $(jarflags) $(objdir)ohnet-generated.jar -C $(objdir) org
- 
--Generated$(dirsep)GenerateSourceFiles.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/UpnpMakeT4.tt
--	$(mkdir) Generated
--	$(t4) -o Generated$(dirsep)GenerateSourceFiles.mak OpenHome/Net/T4/Templates/UpnpMakeT4.tt -a xml:OpenHome/Net/Service/Services.xml
--	@echo Attention: a makefile has been re-generated.
--
--Generated$(dirsep)Proxies.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/CpUpnpMakeProxies.tt
--	$(mkdir) Generated
--	$(t4) -o Generated$(dirsep)Proxies.mak OpenHome/Net/T4/Templates/CpUpnpMakeProxies.tt -a xml:OpenHome/Net/Service/Services.xml
--	@echo Attention: a makefile has been re-generated.
--
--Generated$(dirsep)Devices.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/DvUpnpMakeDevices.tt
--	$(mkdir) Generated
--	$(t4) -o Generated$(dirsep)Devices.mak OpenHome/Net/T4/Templates/DvUpnpMakeDevices.tt -a xml:OpenHome/Net/Service/Services.xml
--	@echo Attention: a makefile has been re-generated.
- 
- native_targets = make_obj_dir copy_build_includes proxies devices
- 
diff --git a/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch b/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch
deleted file mode 100644
index d320cefbd473..000000000000
--- a/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/Makefile b/Makefile
-index bf7a1ba..49bffaf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -70,14 +70,17 @@ else
-     else ifneq (,$(findstring linux,$(gcc_machine)))
-       detected_openhome_system = Linux
-     endif
--    ifeq ($(gcc_machine),arm-none-linux-gnueabi)
--      detected_openhome_architecture = armel
--    endif
--    ifeq ($(gcc_machine),arm-linux-gnueabi)
--      detected_openhome_architecture = armel
--    endif
--    ifeq ($(gcc_machine),arm-linux-gnueabihf)
--      detected_openhome_architecture = armhf
-+    ifneq (,$(findstring arm,$(gcc_machine)))
-+        ifneq (,$(findstring linux-gnueabihf,$(gcc_machine)))
-+            detected_openhome_architecture = armhf
-+        else ifneq (,$(findstring armv7hl,$(gcc_machine)))
-+            # cubox: armv7hl-redhat-linux-gnueabi
-+            detected_openhome_architecture = armhf
-+        else ifeq (${detected_openhome_system},Qnap)
-+            detected_openhome_architecture = x19
-+        else
-+            detected_openhome_architecture = armel
-+        endif
-     endif
-     ifneq (,$(findstring i686,$(gcc_machine)))
-       detected_openhome_architecture = x86
diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch
deleted file mode 100644
index ecc415f91b54..000000000000
--- a/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ur sc2mpd-1.1.5/work/openhome/ohNet/Makefile sc2mpd-1.1.5.altered/work/openhome/ohNet/Makefile
---- a/openhome/ohNet/Makefile   2020-11-16 20:49:27.220636318 -0600
-+++ b/openhome/ohNet/Makefile   2020-11-16 20:46:19.822974263 -0600
-@@ -310,13 +310,13 @@
- cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
- cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
- ifeq ($(nocpp11), yes)
--    cppflags = $(cflags_base) -Werror
-+    cppflags = $(cflags_base)
- else ifeq ($(platform),IntelMac)
--    cppflags = $(cflags_base) -std=c++11 -Werror
-+    cppflags = $(cflags_base) -std=c++11
- else
--    cppflags = $(cflags_base) -std=c++0x -Werror
-+    cppflags = $(cflags_base) -std=c++0x
- endif
--cflags = $(cflags_base) -Werror
-+cflags = $(cflags_base)
- inc_build = Build/Include
- includes = -IBuild/Include/ $(version_specific_includes)
- bundle_build = Build/Bundles
-@@ -371,7 +371,7 @@
-        jar = $(JAVA_HOME)/bin/jar
- endif
-
--java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
-+java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
- jarflags = cf
- dirsep = /
- prefix = /usr/local
-diff -ur sc2mpd-1.1.5/work/openhome/ohNetGenerated/Makefile sc2mpd-1.1.5.altered/work/openhome/ohNetGenerated/Makefile
---- a/openhome/ohNetGenerated/Makefile  2020-11-16 20:49:27.262636458 -0600
-+++ b/openhome/ohNetGenerated/Makefile  2020-11-16 20:45:36.594809974 -0600
-@@ -273,13 +273,13 @@
- cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
- cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
- ifeq ($(nocpp11), yes)
--    cppflags = $(cflags_base) -Werror
-+    cppflags = $(cflags_base)
- else ifeq ($(platform),IntelMac)
--    cppflags = $(cflags_base) -std=c++11 -Werror
-+    cppflags = $(cflags_base) -std=c++11
- else
--    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L -Werror
-+    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L
- endif
--cflags = $(cflags_base) -Werror
-+cflags = $(cflags_base)
- depsPlatform = ${openhome_system}-${openhome_architecture}
- header_install = Build/Include
- inc_build = dependencies/$(depsPlatform)/ohNet-$(depsPlatform)-Release/include/ohnet
-@@ -334,7 +334,7 @@
-        jar = $(JAVA_HOME)/bin/jar
- endif
-
--java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
-+java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
- jarflags = cf
- dirsep = /
- prefix = /usr/local
-diff -ur sc2mpd-1.1.5/work/openhome/ohSongcast/Makefile sc2mpd-1.1.5.altered/work/openhome/ohSongcast/Makefile
---- a/openhome/ohSongcast/Makefile      2016-10-18 02:34:33.000000000 -0500
-+++ b/openhome/ohSongcast/Makefile      2020-11-16 20:46:57.123112193 -0600
-@@ -38,7 +38,7 @@
- # Macros used by Common.mak
-
- ar = ${CROSS_COMPILE}ar rc $(objdir)
--cflags = -fexceptions -Wall -Werror -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
-+cflags = -fexceptions -Wall -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
- ohnetdir = ../ohNet/Build/Obj/$(osdir)/$(build_dir)/
- ohnetgenerateddir = ../ohNetGenerated/Build/Obj/$(osdir)/$(build_dir)/
- ohtopologydir = ../ohTopology/build/
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index e231b67fd1cd..f9d0cbea8d1e 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -3,6 +3,6 @@ DIST strawberry-0.8.4.tar.xz 10781080 BLAKE2B 395898e68117848613666edb545d15db22
 DIST strawberry-0.8.5.tar.xz 10801412 BLAKE2B 4b55a747df72cbf57c56f3e146c8e26e335cfc1238f4dcc8065b4b911fc0ab3894644639a17642a26d7a074d662103e1c55a4acbb6f59bdc971a6ca6e45117ed SHA512 33ab6751e5bd17ff98beed29c179c47bebca92229b94b863a172169704b2fd69d6605cf31db456dee552666b58bcbad867b3cca7bcff2cc6582c4c2c0a2f49c8
 EBUILD strawberry-0.8.3.ebuild 2879 BLAKE2B 2aafb75ee7415b165024983c825759f0355c2c0b86e0d3a8e308633ada9a9b9eae2209bb9bb0c554ea6e7469cc5b84d7c48012354b5c72bc13cac3c64f433267 SHA512 36fc1bf4ee4a8aa2d221cb7f402bf1fe4277544d792980d85489b5242540d48f843d10af0eb66b2acf61d3c6ebff43b3a5cbc4444ba05ea40e9d49a573e6994a
 EBUILD strawberry-0.8.4.ebuild 2881 BLAKE2B 2e02483874fb74f25f69cecf46982485edf74df2b8c8a95d88ab50471ddf47f0c2a2ed36c77bd80360c5da0798210325c3f1398333fcee0a293d7e6f90ba5269 SHA512 c1c9df0afc346e7da6c7c9b14290969449b9bb1de94ad7c83f9e66aace65f9d5cb23c46341b09126184710f462234482017fcca2e683aa087b16af0e45ffeab3
-EBUILD strawberry-0.8.5.ebuild 3038 BLAKE2B ff7e8e7505139bad178b42463b0d6949705d63496577c2d29fd5e0e2ba0f8c79eea4234305c5b903490803a92a1a6de464185c31d7fadc1dea541788524c6285 SHA512 9e189364e00e64d22771fee5bb4d8b3becb722d986e23be7bf601f90758698eaf95d6b3d2978ed2de4d6d2c42960caca5ab546e35bdcc8110f1b450b1f3be6b8
+EBUILD strawberry-0.8.5.ebuild 3045 BLAKE2B 0414e05ead58a2a571e074c79bf118d5377d205aa2eda08fe472360a51d4b61f601429a66891e4cfb24d069ca0a3ef8f6addaa836fada2de364881d7cb99d025 SHA512 07f79ac5c27140b1aa7c533d8d2ccebee62cb716dd77d9669dcc77afff718eb5d6ff84624de86e9ac12f4693a1e1621c0eab60ce056ed3d3d6f2074c9853d57c
 EBUILD strawberry-9999.ebuild 3038 BLAKE2B ff7e8e7505139bad178b42463b0d6949705d63496577c2d29fd5e0e2ba0f8c79eea4234305c5b903490803a92a1a6de464185c31d7fadc1dea541788524c6285 SHA512 9e189364e00e64d22771fee5bb4d8b3becb722d986e23be7bf601f90758698eaf95d6b3d2978ed2de4d6d2c42960caca5ab546e35bdcc8110f1b450b1f3be6b8
 MISC metadata.xml 531 BLAKE2B 1bf5ffc07a64de7716ead9a8f53cd82dd713b243cef24b9782d782887d4d1644585c21d0eacb4cba6768a2807a2823f60bd1457ce992ca0b4fafaab8a1054079 SHA512 c8febfcdf8dfbf0857e2ccdaf3d27606a2a05f2365e4ee0d9634452e4274e7e57d5688a8b97de8833a06f2dddffb07707f523abc9bc5b0a5850f1fc84d00081a
diff --git a/media-sound/strawberry/strawberry-0.8.5.ebuild b/media-sound/strawberry/strawberry-0.8.5.ebuild
index 0d5281b6b697..27a5e697eee1 100644
--- a/media-sound/strawberry/strawberry-0.8.5.ebuild
+++ b/media-sound/strawberry/strawberry-0.8.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index a9768e58c805..0caa3a0962c3 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -2,6 +2,6 @@ AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfa
 DIST TeamSpeak3-Client-linux_amd64-3.5.6.run 100152301 BLAKE2B 9fbaa32ac000c9e29e09dcb1c932acea45265d5cf464308d6f27063fb3095690f3cb96abb061ce947438a4b919dcbaf8f3f0189048b470b09bb2b8285e426e39 SHA512 fe1b41773d2b2de8198fdaf189c6665994eeaf6a0255485f7d342a3e77702f5515d5c5c685410a0b5844b4ad5c395d57b68e57c7b1f46bd1211ef813ce1e0030
 DIST TeamSpeak3-Client-linux_x86-3.5.6.run 98637555 BLAKE2B 6f891e6846f8f899edb8ef107b7ea6518f413488525b7696863292d99d73614cae40631f5ed2341cce75ea62ffd94c60968ff6b5d587446d7469271835c01202 SHA512 dfc5ed3e2a92ed9f1cea2fdde5e40cf73e4a999ea782c434b26072ac0e7ac37d6305c06ae2d39c104eeee10639f325c7b96f538082e60224a68c0553fab0d12c
 DIST teamspeak-client-5.0.0_beta40.tar.gz 116647752 BLAKE2B f0e5cf0aa2fe4c69bd7c621454918c13175d0708c3ad54b5dd0b18dfbbd0dc18af520d0f65e391f36d7d5cb3a8c2eaffec0619101f4b59262b8885cebf86629b SHA512 abeacf9d200f68ae4ac9a9adee146a52d81a7f34c7593cfa0ca363300f18ca1d85e582181d1c874accb5a84eb17bb1ed6bc79fb460708fbb2ebd937c40f28607
-EBUILD teamspeak-client-3.5.6-r1.ebuild 3043 BLAKE2B c11d9e2fa4c0dc7609db979a3efe2066fd5c9eab0fc104ca6009026a8f2566e4e9abade67968d6a9bfe8ece59ddb356c26c5198dc0a1a6405d603f3497ed7c3a SHA512 22ecee625ce5b934108f117d156714178e4909f623984733f1176f000fbfe041f0b264ed9c95dbdc2a3838d75c37cce67d61c5148f7cf1a802557812434f8902
+EBUILD teamspeak-client-3.5.6-r2.ebuild 3045 BLAKE2B 33a81fe060e563a7357078ebf301b7400727a656a035987d8391c8c2dac1d5d5d4169a1c13fed0d5ed5e2a3f396705071bcea8a81b18cf76464b68a59026bcb1 SHA512 167a5140716b9a3f5b2c6925f1773e2c1be592668cb07d5d672f2de611486a11b05964061a860ab802dc784e6552f70d01a774e3468771590a8da34ba682cbd5
 EBUILD teamspeak-client-5.0.0_beta40.ebuild 2076 BLAKE2B ed04658208474490cec01da9f5ac810aa0e152e256bbb28c82ea6527ceac78a8adaffbc084f284adf9a9bee04fcaaded432efc01fd2e0e734b0661d8a80091c6 SHA512 b5acf657f599dd16f19053127e3838458c9fff513a4ca2eb059434eeaac918cefa3d72cf7b32b94177e1ff00d3fe51e07fc991fb53dc261ce7e43b3a1adf2dc2
 MISC metadata.xml 744 BLAKE2B e5a883b78a951de65c5a0ac3ef23674fc120339531a8e10225f5049a67d42f206fce5296f41bbb329105386b2138c83385c0b3293199409ac76b92c10dd17696 SHA512 6e8688c9c36c34625b8bf8b0e2870b88a8f7df4986f2a2579c089260058022cc5177e5108e8f4616cebfcfc1c132277eff74b9d45054b6d61f87c8966dff9156
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.5.6-r1.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.5.6-r2.ebuild
index 7a9b41fc5fc1..99cf08b2b88b 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.5.6-r1.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.5.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ BDEPEND=">=dev-util/patchelf-0.10"
 RDEPEND="
 	app-arch/snappy:0/1
 	dev-libs/openssl:0
-	dev-libs/quazip
+	dev-libs/quazip:0
 	dev-qt/qtcore:5
 	|| (
 		dev-qt/qtgui:5[accessibility,dbus,X(-)]
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index fd4fa99ee4c3..a0e1b4766ed4 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -2,5 +2,5 @@ AUX wavpack-5.3.2-fix-overflows.patch 2094 BLAKE2B 8c2abe6d72109b108d1e8f4400f5c
 DIST wavpack-5.3.2.tar.gz 2047344 BLAKE2B 621414f580ef0c6f71ec411cafba5e9d3f971c9ed3fa901d92083b803fb337ad5455c8f488cc985d2203fde56572adcd2899e5a5d6e07365248ef6bfd59b591b SHA512 cff46e000c2edf0124e2f4c9577611d029f124c235bf7811a58dbd5d87a02827d25f7bd0e28d2f05fd413ee9997ba48390acfc2a91ebb53885eb2a0423994a7b
 DIST wavpack-5.4.0.tar.xz 769764 BLAKE2B d35eefccf3402388d88d370daae41dc0e4f21808474e668f92a9dcee978ae71b96ae167de098a0924fcbaaa75f9b07270280e7c3b16cc8699ffaa7d2eddd0de5 SHA512 de4e75539c9b949d22f39ab73721c8a4ee7c38ff08835aa28b1d56bea08c332bcb601a54998efe520f3653a2e29c73dcfd716ad19707bb2815403786d9ed9c11
 EBUILD wavpack-5.3.2-r1.ebuild 1070 BLAKE2B 44d32a09ddbc7ba87f4af8fb53d1f57fe21525e1b50563fbf8063ab362b9e06040409ab91068a225ee4e32748ca0401b6bbea28661ef89ec985ffdc6183841a6 SHA512 c21d4e74634e9cde5ae49be7becbe7ff02dc0872caef71ffd067e73c8db5e6b008a1b5cef7673002a3684bc72c1d491d682e39bb8b43574a8572281e471c2f1d
-EBUILD wavpack-5.4.0.ebuild 832 BLAKE2B 7faca395788a857042c96c10e92fa573c7d9668e89d676ef2eb1885de48d65139d91dcb4369a92e4eecc88596ec2cd06145ed810be13ee3ec23fd6dbed0ccb9a SHA512 d28d60397a7c299c3ea73b7b9ee515ac70792c1cc2078ab79253451a4fe0dd1d343215b78168a3bc6e767db874b31dae192fc1c0adbcb415b9075d5d10448fca
+EBUILD wavpack-5.4.0.ebuild 829 BLAKE2B 6281f715c3a4e5236954d99118622d4404d181d92e4b54623ea16631b24343fa2a640f0b7d78caf1339b17aa38247c60a5c329ad125c3fdd25a050fc07f95acd SHA512 5c205476657936257f6d4c5a5221e72ad727a28e201ad98daa76f9651b49e5306c6e096c8d0a156353b664a68ffe987fafcdbffb9d37e333bdb784dde04d2957
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/wavpack/wavpack-5.4.0.ebuild b/media-sound/wavpack/wavpack-5.4.0.ebuild
index 5833174135ef..5cf9c05d1266 100644
--- a/media-sound/wavpack/wavpack-5.4.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbry/WavPack/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-sound/wildmidi/Manifest b/media-sound/wildmidi/Manifest
index c87f5e8c8651..92bef2684543 100644
--- a/media-sound/wildmidi/Manifest
+++ b/media-sound/wildmidi/Manifest
@@ -1,5 +1,3 @@
-DIST wildmidi-0.3.13.tar.gz 132407 BLAKE2B 5f603adb7583d47ca0595a48a385412d09ca8b19e99c93ba474d91076fa17a54e12e08bb39ea73d16c07addeab86e6c9d8b778d19045ef6b7d551d041bbc58fa SHA512 e9ede8a98c97e57a7bd34e63fc725a1b47bbff6b41f5dca101249917f0e7756ce4d93a84b8d5b6f592687fd3deed369c22c727873c9bdd1bea6e8c31fdbb4fdb
 DIST wildmidi-0.4.3.tar.gz 196750 BLAKE2B 580903dd1e7dc61193b593f3706d5070ae5cf26394919f8d632098aa0dda14d8d65631c902a6a01d02d046e639df4d66727849954b5d6f76dba8d12235e20b8d SHA512 7e86e998ee97cdf57328e4cf5ef52a64926fd01999879c0eae5b6c823be4e6d116f7026230bd15d209e6616fbc7ba1c29ebd1f3be04735e341ce5c83298f956f
-EBUILD wildmidi-0.3.13.ebuild 1853 BLAKE2B a0d488da7321843e051c5c0512efced597420298e86a89bf8e35bf425921e834135ea13f6d7b30d67897a594eb7dfc418bb9d9881f2ff1ddbd247963c8964abc SHA512 357412f782b044b36024adf9a4b77bc1bda16317ccb18746b75c53991d57519450c929baf19a04bba546c97cdb2cc7557c2e34400cc940bba2ec4304487efcd0
 EBUILD wildmidi-0.4.3.ebuild 1322 BLAKE2B e5e32633203e7bf0ee7f2bbc5d618e05132e91415a07a48cd01b4b5c0719172d313808abb318c68cd625124c4a79e5578e27abe9c887e9b054dee581b0f600cb SHA512 99a54c4d0124caef134e9c8fff60d563e974db43bba0ae74476e9bc5cd0a37ea5e8276e8c91b54c2ecaa89b2e7f17e41bf46c192dd0d8cf98ecb4572cb5c1f2c
 MISC metadata.xml 584 BLAKE2B d15f9bff872c58f447fd538e2726b8a9219ee24567cde6c4abb7d986d19bb046d43db9a743820102ff4a2c8092def068462ca9601d012aff5aac5d9a6a06443a SHA512 f7a7380f326968b403a57071a7acfcfcf35a5e5744ca79585145e4e81beae2d4ec8bd2bc5cbd0d8a1c49d10cdf52dac272319c18e6e5b6c7a02dd46aaddf6da8
diff --git a/media-sound/wildmidi/wildmidi-0.3.13.ebuild b/media-sound/wildmidi/wildmidi-0.3.13.ebuild
deleted file mode 100644
index dfe904340d1f..000000000000
--- a/media-sound/wildmidi/wildmidi-0.3.13.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils readme.gentoo-r1
-
-DESCRIPTION="Midi processing library and a midi player using the gus patch set"
-HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
-SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
-IUSE="+alsa openal oss +player"
-
-DEPEND="
-	player? (
-		alsa? ( media-libs/alsa-lib )
-		openal? ( media-libs/openal )
-	)
-"
-RDEPEND="${DEPEND}
-	media-sound/timidity-freepats
-"
-
-REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
-
-DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
-	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
-	For more information please read the ${PN}.cfg manpage."
-
-S="${WORKDIR}"/${PN}-${P}
-
-src_prepare() {
-	# alsa openal oss only make sense if player is enabled. See CMakeLists.txt
-	if ! use player && (use alsa || use openal || use oss); then
-		ewarn "The 'alsa', 'openal' and 'oss' use flags only make sense if"
-		ewarn "the 'player' use flags is selected and as a result they will be"
-		ewarn "ignored in this build"
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_OPENAL=$(usex openal)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PLAYER=$(usex player)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	find "${D}" -name '*.la' -delete || die
-
-	insinto /etc/${PN}/
-	doins cfg/${PN}.cfg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/${PN}.cfg ]]; then
-		elog
-		elog "Old /etc/${PN}.cfg detected!"
-		elog "Please migrate your configuration file to"
-		elog "/etc/${PN}/ directory which is now the default"
-		elog "location for the ${PN} configuration file."
-		elog
-	fi
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
commit	463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree	9aa75eefc5154eaf0e3c33658b830fc54dc68052 /media-sound
parent	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)