gentoo resync : 23.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
commit: 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree: 230f3135ceaace633cf93e9838b185c4a6664c2e /media-sound
parent: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)
69 files changed, 674 insertions, 1230 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 06e21441bc67..9524ed7f1ef2 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/apetag/Manifest b/media-sound/apetag/Manifest
index 453133c9ee95..7106f8d765bf 100644
--- a/media-sound/apetag/Manifest
+++ b/media-sound/apetag/Manifest
@@ -1,5 +1,5 @@
 AUX apetag-1.12-py3.patch 3784 BLAKE2B 039a42333dd48c0b2f3562411a53be1c793b5c19b9c9afc711e16a4b8a959fdc7a2fa8564c71eb99be403d596700a98e28529a39a45bffbd3315f42571085255 SHA512 325defd7e7114406185af0547d2d53cbf7a92a365016d9e7a08d12dec14fb5b364ac1051c86db67ce2e37066db83b9a7c9995cd7a6e1fd3b1b04a39d22651f8e
 DIST apetag.1.12.tar.gz 29942 BLAKE2B 866f0ed90b9bcdbed3c0a35729327058806478d1c17a7f88528809b1480a2a55f4665ce809737010cc3b642b6ed99ec22db84b7b6ec4b14f73974274f3e31bc5 SHA512 615c495721c6d46e6ce4546ede218efaac1f3fda91dcd9b8da2b8f7c79cc0f5fbee7dd5bc433c0b125973a816980abb8677f16d4000e5e71699524baddd16887
 EBUILD apetag-1.12-r2.ebuild 984 BLAKE2B 3aa9e1aace83ecb791d364bf015cc92195eb17a193c2910c40594557b0093cc0a94dadb378ab5abc7ed995e93006a63d173101144928e95d48564eddf3f55287 SHA512 c9b821fd2e66627a6133ab39ddb21fca70d3711061984d6d80df34c7aa1a0407e0d7f969879a88b4a087626341b70eb9bb8a902da8d7e921326187a5fe3a21c2
-EBUILD apetag-1.12-r3.ebuild 1046 BLAKE2B b534684c1a95c1ca2f5037e9c71813a6599dd474f37efa6cab9bc142cfb6982b5f66e8d952316806b328e806b5537f4dba550fdad20b2dd1e09de79747005d0b SHA512 171d86ee6b0f25a1d7ba3be3c08be8e858a27a09f04dd8ed3b867381bc26309899829af50c546fca14bd96fdbb25d96d67e06b62e27a4ee9d26a7d5669652d07
+EBUILD apetag-1.12-r3.ebuild 1045 BLAKE2B b2465fcf3892c933c3f3a5b2cfa08d01ac09da19c696eda3ffc85ab5bfbda1e14383d9a2b7c250f2a471ee7ba814b69a8f72b52c5ec4f06bf488e1db8dcadf06 SHA512 c72803b6ec6c5fb3bdabeadbea0ee36ce16f6a6f8a903b9c5b5a98439904b9ab17c0556b9803c09e1bd9990d1cb4a45b461df0a92b429cb2b95257445e5d1e23
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/apetag/apetag-1.12-r3.ebuild b/media-sound/apetag/apetag-1.12-r3.ebuild
index c485ce960902..a103ebb7a5fd 100644
--- a/media-sound/apetag/apetag-1.12-r3.ebuild
+++ b/media-sound/apetag/apetag-1.12-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://muth.org/Robert/Apetag/${PN}.${PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index f857a21b7830..81b002695c6e 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -5,5 +5,5 @@ AUX sdk.patch 4357 BLAKE2B ad43209ebf78f1f8937bfde54c88034a9c0f426caf62da5aa70b6
 DIST apulse-0.1.12.tar.gz 117220 BLAKE2B 04d88a298ff5e21e19fda1979ebbc96a6441f83212d6903a004a54ee360276985e66b637571a76e3fe6821d42762ac515b02a8a2cb0149a66f3150e34bd0d9b7 SHA512 9fe39ab93e90d7ec589c7632bf439bfc7fe8bbd0792ce1197ec8547fbe1901fec50facdf33c55cfbadbc1af4414fdf48f1f241406903a8f15f445b97dca7076a
 DIST apulse-0.1.13.tar.gz 117369 BLAKE2B 8cf527daf21420a72e46968a3b07ab61029f404a2b6574ac1f08dd40528f3e6e4baf7e38f5914b0c89252e16eec5e8f3722be51e5a61b6a71c683e994740b4bf SHA512 366385ae2304f7ff697ba70951d0753a5b1630310922e3763fd0813a73e0b4088b715135295aa2fa9111b8edcf91d82849dc31346b292b2e9db598bcdd47b007
 EBUILD apulse-0.1.12-r4.ebuild 1449 BLAKE2B a906511d311d43c9c45f8f292c02b98add6e3d74d7fc9402a4ec9a6629ce70cdb839a98a5a23179ccdb8e821fc3016cabdb5679f4a2ddb4c0de02efd6202e8a3 SHA512 2b865a68d87ee96c614f92263936c3d9f0a183a603af84b8b46f306173b06ddd86a553b3f1c05fa8a860c2fe3582e0f650c14f29d2530b138e0ace95bf60bccc
-EBUILD apulse-0.1.13.ebuild 1667 BLAKE2B 5df24b01448d1abbf4b64d30f101d8bec0a98c8f9baa1978694190cc1fc27ce3b0e883da54e712aabee300bdfef001954a6fbef49d9bea29751ddffbe29281df SHA512 db031f1f5797ec0899577688bd4487636651f942496cfdf9e27bf96153ba666161c490264ef3bd9198472064529d4c99a2b35d942cddca611ed09dfdc7d7687d
+EBUILD apulse-0.1.13.ebuild 1665 BLAKE2B f200dcf1e3ff2829528f20d70d4a4d1d8e9a6b1c5a743c43d4e718f33533de85e022b8b66dabb1098e873994888c52389c8e41dd6df744a69493cfdfb447cebb SHA512 464984d964c6e4615ff6185f8483cd832f5b69427e1aed92b12ec14ef47df023faafeaf0439d3250f9a7ae119bf33bc140f39aff1af2c6e12b672629c2e17d2e
 MISC metadata.xml 539 BLAKE2B 958678641d39164ac7da9bb779329185aafe5d551dfbabaaa0872b47cbfeba6fa5d545e715ebb1fb4eb730bc192696a1517c4f474a0a51f81136b213ec4fe9ea SHA512 49cce06f24b1c9a5ec42f549fc018517650339347f97e02864ea0e2a4216c092d38c75c46a588bad3896843962b477c2ad94b34cb1f39f8255116fc4b2c92fde
diff --git a/media-sound/apulse/apulse-0.1.13.ebuild b/media-sound/apulse/apulse-0.1.13.ebuild
index 30be8c6e7639..8fc4e08becf5 100644
--- a/media-sound/apulse/apulse-0.1.13.ebuild
+++ b/media-sound/apulse/apulse-0.1.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 IUSE="debug sdk test"
 RESTRICT="!test? ( test )"
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index ec9b5fb7d2b0..58b190ba40c6 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -2,7 +2,7 @@ AUX ardour-6.2-fix-no-nls.patch 13153 BLAKE2B e246105d9c4b43c109155716903de02051
 AUX ardour-6.2-use-signed-int-for-atomic-operations.patch 2015 BLAKE2B 535da9c7318a2c5e12f2d531acb09a47ebcb570bd59583e5683df05c1067d81e09f0fbd7a45f89843571fbc3a655c68bf11313c4aa73f9ce02fdc52c68414fae SHA512 720ee2920cbb88ff5266202ffdf5464503550f47fa440466aa241e89380548c31079700a1cf55dd9dd76a4e9185be6fff9ee8d499cc5e0bfc7976a7ebd0869fe
 DIST Ardour-6.2.0.tar.bz2 11042230 BLAKE2B 7039b0ea7a8550d5372ce795bc978f3d6129828cc6e93d98ce8ba74c6fab3db0e4343142d75e9684f9dffdaebf1ee634f8ab0165f510eb658d32d890f6417b63 SHA512 d4c20968738ec2fef382fc1109f1b17560863c4eb0f7cf5c42b79e9a610916e57e6c01985a2ca2a66b8647e99c10bd98c16e05eb81a7811e73e482f7af11e4a8
 DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B 6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487 SHA512 ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0
-EBUILD ardour-6.2-r1.ebuild 4435 BLAKE2B e546f198d129f4f5193e9f6d153859385fc1e420fd8d9995f73587d9a555522d077bbea684d252770f091c63ba844f24b8564e74b8767fc9e3ff306294f5abf0 SHA512 7c82b2762b3e787fc7276aba9fa68391fc599dc672e72f55d1280a7279c350de27f1a8129c0b55fa672cff2b94c0948d8d7cdb43085bd887793b34f119fd63e2
-EBUILD ardour-6.3.ebuild 4323 BLAKE2B f9970069239670093057c724947e5b2fb5235cea146c201730d702d74567990bc8501b2552a044fbfe38c2171754165b9463711be3f0d2301ee51bd4049a42aa SHA512 a265d4655dfc0bb1d3fcb7bf727ea7481a2ed52e0269b45693f04529a3fda7e4eb6b792d632530eca78f37df978dad8344e8b461cb42a774041adf7cdc53df0b
-EBUILD ardour-9999.ebuild 4103 BLAKE2B 8f9d9dd9726c416cfeca182d72fdf3de6d666e7954c887b451d6b0436224ea6caa5dccd04aaf753c1d25e2ff188017b9c61b22d5603a1dbd79a2d48ce1967e8e SHA512 9ff953c51285b0f978fd9b885a39de70a8758807bf22bb62e37853c6ffe0ced0fde17e7849b9e9b24fc4acf30de507e76a9b8cedb7c9404215d4f2096434d047
+EBUILD ardour-6.2-r1.ebuild 4531 BLAKE2B bb80b35e9ee409319f2179d9d899d5c3364dc56db33f241d1881723a29bb16ad7f8ebff99c348163a17b0a3c27fa9de086a465b99d7d0f6866c7e0198018dd19 SHA512 9c37a9e9086300d93e2e462f3de52bb0f4985ae6b52790d54327b5eeeb71bab91afcff2db39091919d43fdb46c1399f18bfd97b8ac72157dd8f7eab53d373483
+EBUILD ardour-6.3.ebuild 4420 BLAKE2B b4d034279e29e9db62c0c890e28b216c44c37697b57f51c5f5a4db0f5ed3e3b1bd0432f3022a0e4179fe8df7cd7792b7362af88b8aecb58998d9c3db228b9383 SHA512 45b0ab3bf7e5fc8e27e7d6c0520b324d52f546ec3831dc4cf66203d37f4361b9c4851092f7ddbd77069eddca4f73de3b81f4c03bff65c53eb41c59dea0b5dbcb
+EBUILD ardour-9999.ebuild 4200 BLAKE2B cc1cc69ddb90f45526ad638f551b266a4742525634386cc24c48cbcd30986ec9c1c2e2cb6ebc88c654ae94e13583dc8dfda6491ef7110799d3aa8987fb9597b1 SHA512 863550b9a61b77aa128fe30d4772c2a2b6394d8cb3eddcd24da792ab94f788c0743c18d431cd055ac21a7bd1bfe976f94651721dfc87a9cf8654b3d83f2543a7
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.2-r1.ebuild b/media-sound/ardour/ardour-6.2-r1.ebuild
index 82d1575b195a..735fd6555384 100644
--- a/media-sound/ardour/ardour-6.2-r1.ebuild
+++ b/media-sound/ardour/ardour-6.2-r1.ebuild
@@ -14,14 +14,14 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
 LICENSE="GPL-2"
 SLOT="6"
-IUSE="altivec doc jack nls phonehome cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
@@ -55,6 +55,7 @@ RDEPEND="
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
 	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
@@ -120,15 +121,19 @@ src_prepare() {
 }
 
 src_configure() {
+	local backends="alsa"
+	use jack && backends+=",jack"
+	use pulseaudio && backends+=",pulseaudio"
+
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
 		--destdir="${D}" \
 		--configdir=/etc \
 		--optimize \
+		--with-backends=${backends} \
 		$(usex doc "--docs" '') \
 		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
 		$(usex phonehome "--phone-home" "--no-phone-home") \
 		$(usex nls "--nls" "--no-nls")
 #not possible right now		--use-external-libs
diff --git a/media-sound/ardour/ardour-6.3.ebuild b/media-sound/ardour/ardour-6.3.ebuild
index 6bd303b0e465..75cb0848c611 100644
--- a/media-sound/ardour/ardour-6.3.ebuild
+++ b/media-sound/ardour/ardour-6.3.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="6"
-IUSE="altivec doc jack nls phonehome cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
@@ -55,6 +55,7 @@ RDEPEND="
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
 	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
@@ -115,15 +116,19 @@ src_prepare() {
 }
 
 src_configure() {
+	local backends="alsa"
+	use jack && backends+=",jack"
+	use pulseaudio && backends+=",pulseaudio"
+
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
 		--destdir="${D}" \
 		--configdir=/etc \
 		--optimize \
+		--with-backends=${backends} \
 		$(usex doc "--docs" '') \
 		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
 		$(usex phonehome "--phone-home" "--no-phone-home") \
 		$(usex nls "--nls" "--no-nls")
 #not possible right now		--use-external-libs
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 43c1789b324f..9e5b5ec26e19 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="6"
-IUSE="altivec doc jack nls phonehome cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
@@ -55,6 +55,7 @@ RDEPEND="
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
 	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
@@ -110,15 +111,19 @@ src_prepare() {
 }
 
 src_configure() {
+	local backends="alsa"
+	use jack && backends+=",jack"
+	use pulseaudio && backends+=",pulseaudio"
+
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
 		--destdir="${D}" \
 		--configdir=/etc \
 		--optimize \
+		--with-backends=${backends} \
 		$(usex doc "--docs" '') \
 		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
 		$(usex phonehome "--phone-home" "--no-phone-home") \
 		$(usex nls "--nls" "--no-nls")
 #not possible right now		--use-external-libs
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index e3301b2c4a84..e71e5f59a0ed 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,20 +1,10 @@
-AUX audacity-2.2.1-portmixer.patch 776 BLAKE2B 18e5e3a3394c2a56afd9314993bde41376a59bc7c480b159ca9d14ff812f507de32018d5b28ee9a2cdd4f3b5f1a6e420e85f3d8660c0fa0e28941f6fdce9fb6a SHA512 f00fdd46150181873bc4aa24f95b3491471198429f47fae2d4f79f0f360a642adf94936dcf63bb02e84f9581d87c05dc8d93ed37eddaf43e31d900d505b50805
-AUX audacity-2.2.2-automake.patch 916 BLAKE2B 8de3bb400bebcfcd1b2e51ce8ada2d24e9524b56219f31bd9181e6c6c6c7382aee3d32bfb2024b7d3155f9f2464c541c5e12c7e395ce3fd9197234db8347b4d1 SHA512 2e89f45595674c3388648a6aeac4f43b82fdda2f5ba8efda2d2d98a11be2a76cab5cd0d8a87d8e581810a6ed3984d88b01e7462b51544dea550952ab563defca
-AUX audacity-2.2.2-midi.patch 4999 BLAKE2B 74e99c16abbd64f4f74ccc1dc4e76a156d492e0f8d929e8e47bf12f574741fdf052ad7c9b780fb8c578790c505990d42712239470bacc5ba132dbdcb8fa3bc78 SHA512 5c0f9ca7d25ac2c15cc12a643408066eb7b320fb7c1476d9169be25128b3a4b682ed77e9d101923c7c6df187571874b9e67635d98472e875b7520053909b271a
 AUX audacity-2.3.3-Fix-building-against-system-portaudio.patch 1952 BLAKE2B 9a5ef294d55dfe226175d2fdd8b23a9a4e6b3e963c26b9d4d8b430054dba5c39c6ae97f911b720dc53af5173c6a639275dd119c5292f53164e749782fa8f1e46 SHA512 ff85a33922bed3a626dd82c71406d81ac59c36dc45e5d2164662aabcd14a859479304cf684b9f64d0b110a9a1a82042b130c21e820ebd4c917fd9094c0737ed2
-AUX audacity-2.3.3-fno-common.patch 2232 BLAKE2B eeaa5452a3da08bb4ba22965ad9a3ce77b838e9177d4cc53c630865bd91dfd1d348dcd4128b20f875e9a50d9ec19fb6e371cf28bf059072437480f71c7225f1a SHA512 3f534101b6194b4f557b88cdf96ae91cc3e2c86ef387ba5ccc33aa192212074eb018de9dd2d459518133baf9f46c1c8d499d74ae00b593a26b904ac3d288a700
 AUX audacity-2.4.2-add-missing-include-portaudio.patch 346 BLAKE2B 51b3a09a2ed616364f7ded02663bd0a527a12d088e514fa494f7324756263cd73713a50391f3895366c3d92d491ef56d21ee380bf9c640228d5ab680328f37a8 SHA512 ccc7ebfc6453ef02b2ef4e546d8c96d45fb5ccd46a088225dc241371745bd8f39dd63b0044bfba24f1eeec70affcac29a4499f0d15a16fb4dd99eb87980fc4fa
 AUX audacity-2.4.2-disable-ccache.patch 545 BLAKE2B 0173fc4de28ec040f457ad54885d8d0d8d68c27b683684b4eb6404771c588a6374232b0d275cb751a1466d0e20377a2eeec56d3d423167388858bbb4ddef1056 SHA512 0026bfbc25a9bb83c49492f89c60f42f4be5dbd70baef0b0afb75d4d5b2a1f87e070d3243e8432b1b283d5a437221a209126a157737fc2db601b7b3e226749d1
 AUX audacity-2.4.2-fix-gettimeofday.patch 338 BLAKE2B f9deed24aca404693a0094b83ec310d7609b6989749f42b3b6304feb9d62c02436b0c4d62116b145d44d1a0ddeaf38c86794ef449393c998f5b5a062e408ed3f SHA512 d19082009dc915b28f02e3451f06e5041b68159af138ecad10641f3c59526b4ab2873e6e676b87dff0e54320b48a6254a0da434566855605ca81b747a732e952
 AUX audacity-2.4.2-fix-metainfo.patch 468 BLAKE2B 87133634ca1be0ce0392b044d60a1632c6a963ee11a1893064c41c9d8093adf081bc3fd6a2e2dcc909573bd22d1d21e8cb58c8bbf9e464058780cfce839d6c06 SHA512 a2cdabecf53c03b77434ddbdbfb7606eb52f8e52b67d62bd206799eb0e9399345967106d7644784de338ef68d3e87c26952c491e775b1a323e1e2a91e41fe200
 AUX audacity-2.4.2-fix-vertical-track-resizing.patch 462 BLAKE2B 3f6fe748506f39ca64b72449853bc396389c2760767d916301298951aaa7b82cc1379c2b7d9860b4579a964dedc6806c85120cd3f4f1aa2b726ae5846bae1df2 SHA512 dc7c2cb3ae1e47e00f473b0943994e352275dc41d41255b2b1ba2e042d9bd6ab046f2088cda81dbc22f2ffeb13a97d28073ce078e35bb29e868f6fa2e8b9e0df
-DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846 SHA512 0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
-DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53 SHA512 a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
-DIST audacity-manual-2.3.3.zip 15135177 BLAKE2B f281fea3344513152f0841e11e5dcdfea591d7dced046028fd67954e6a34a0f7bad41cb37215d4b784d92c6ee64038918e521e1117dc0ccbc0101404d1388c84 SHA512 2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
-DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
-EBUILD audacity-2.2.2.ebuild 3289 BLAKE2B ff93b28d787c0b5d25b0f87f0fae06960cf74e8e4a730e396cd7005be47267c7056a7df4c674effdfdd10a07ab71e6ff9b212069b169fa03e4f18bdbd1731456 SHA512 cdec097cb4416242580921bb3bf128b7532a79b096cee81c1b8fc5375a6020fb922e8f63bc7cf96f21fcab9f92df22d543ff0630a87d064df8952cae2895394b
-EBUILD audacity-2.3.3.ebuild 3232 BLAKE2B 4b0a5cb513a911a615ec96c6816c910b171da04390ed89ab76c7d7498e53342044dd206c446873c47a2f1a5b0233a92cb0d57c26f28a2684a3a9fa3020572211 SHA512 671e750ca235b472ccb95c8d0d6ae2417d10311bf6b7321e323e547ecf21e7d578e04840e032e3afaacdf8cf20976961143a8100795cae1c2b36aa1b5ce3a02b
-EBUILD audacity-2.4.2-r1.ebuild 3952 BLAKE2B 0d9d69c47bed14c7647d0b3adccb7407c1b2c6d8ec3287e0b6a810133574d1c20148cf468e460b77d56ee47fed6ca7dde8f253861dbc14e64adfaa2c1a143d62 SHA512 fdfd36cc360d998899e62237e89fbe11ecdcdc3ca656f4a7dc8345ffb63c85fc9e24a665d167d068398e6b4798f5f5f46cae3d7427dc9c00d6baa616bce7d334
-MISC metadata.xml 1343 BLAKE2B 5bd530b1826b79a7b2ed54ebe055f752b8cdeb0d4e837d184deefb4ce8a2395e243d690bb0775d4e022d990533b55c9c6d7fed1c60c213e09fe351e161530b36 SHA512 ff75ba648bbbcff37e9529b8b52a1c6b86aadc8b650d6e121e1e5296514f1adeee0b52e37856c466c1c88baf7fcfcc3db6bcb935100e8a623dfd8926e697c6e5
+EBUILD audacity-2.4.2-r1.ebuild 3951 BLAKE2B 0c4a89c17417e84e9934f62b360afad1ab812122109650a7769f96e09bec2b3ce94e8833787522b78ce61d09bbf6e096087e29301a5b20d236b489f62812e459 SHA512 4b7c7a277d22c42b949605c263ee099eed93b1f68e036c887985d3e3516c1355dec6f3940ba92dc8eafa1b4a95f3e16f4c10ab81f9d7de119c76d914d1740d9d
+MISC metadata.xml 1188 BLAKE2B eaa473c8b3c3f733056574cc6622e1c57af8241c86434c1a204dcfc8e9149da4f6f82bc610f2541add62d2a6e7dfa786082f2b9537319d45ca45ca3cf65dd039 SHA512 8c25d530d234466b7476a2355a6003702fa43e7d5fae712172e935a617d03fe571e3d57d6d6fc249ccfd6002ade8b13d3831751414b43cb037c9e6dbc739109a
diff --git a/media-sound/audacity/audacity-2.2.2.ebuild b/media-sound/audacity/audacity-2.2.2.ebuild
deleted file mode 100644
index 414cf0f7772c..000000000000
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils wxwidgets xdg-utils
-
-MY_P="${PN}-minsrc-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://web.audacityteam.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
-	doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
-	# wget doesn't seem to work on FossHub links, so we mirror
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
-	+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
-
-RESTRICT="test"
-
-RDEPEND=">=app-arch/zip-2.3
-	dev-libs/expat
-	>=media-libs/libsndfile-1.0.0
-	>=media-libs/portaudio-19_pre
-	<media-libs/portaudio-19.06.00-r2
-	media-libs/soxr
-	x11-libs/wxGTK:3.0[X]
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? ( >=media-video/ffmpeg-1.2:= )
-	flac? ( >=media-libs/flac-1.3.1[cxx] )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( >=media-sound/lame-3.70 )
-	lv2? ( media-libs/lv2 )
-	mad? ( >=media-libs/libmad-0.14.2b )
-	midi? ( media-libs/portmidi )
-	sbsms? ( media-libs/libsbsms )
-	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-	twolame? ( media-sound/twolame )
-	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="soundtouch? ( midi )"
-
-S="${WORKDIR}/${MY_P}-rc1"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.1-portmixer.patch" #624264
-	"${FILESDIR}/${PN}-2.2.2-automake.patch" # or else eautoreconf breaks
-	"${FILESDIR}/${PN}-2.2.2-midi.patch" #637110
-)
-
-src_prepare() {
-	default
-	# needed because of portmixer patch
-	eautoreconf
-}
-
-src_configure() {
-	local WX_GTK_VER="3.0"
-	need-wxwidgets unicode
-
-	# * always use system libraries if possible
-	# * options listed in the order that configure --help lists them
-	local myeconfargs=(
-		--disable-dynamic-loading
-		--enable-nyquist
-		--enable-unicode
-		--with-expat=system
-		--with-libsndfile=system
-		--with-libsoxr=system
-		--with-portaudio
-		--with-widgetextra=local
-		--with-wx-version=${WX_GTK_VER}
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable ladspa)
-		$(use_enable nls)
-		$(use_enable vst)
-		#$(use_with alsa)
-		$(use_with ffmpeg)
-		$(use_with flac libflac)
-		$(use_with id3tag libid3tag)
-		#$(use_with jack)
-		$(use_with lame)
-		$(use_with lv2)
-		$(use_with mad libmad)
-		$(use_with midi)
-		$(use_with sbsms)
-		$(use_with soundtouch)
-		$(use_with twolame libtwolame)
-		$(use_with vamp libvamp)
-		$(use_with vorbis libvorbis)
-		$(use_with portmixer)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Remove bad doc install
-	rm -r "${D%/}"/usr/share/doc || die
-
-	# Install our docs
-	einstalldocs
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${WORKDIR}"/help/manual/{m,man,manual}
-		dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
-		dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/audacity/audacity-2.3.3.ebuild b/media-sound/audacity/audacity-2.3.3.ebuild
deleted file mode 100644
index 0418e4cc8654..000000000000
--- a/media-sound/audacity/audacity-2.3.3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-
-inherit flag-o-matic wxwidgets xdg
-
-MY_P="Audacity-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://web.audacityteam.org/"
-# wget doesn't seem to work on FossHub links, so we mirror
-SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
-	doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
-	+lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
-
-RESTRICT="test"
-
-RDEPEND="dev-libs/expat
-	>=media-libs/libsndfile-1.0.0
-	>=media-libs/portaudio-19.06.00-r2[alsa?]
-	<media-libs/portaudio-20
-	media-libs/soxr
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? ( >=media-video/ffmpeg-1.2:= )
-	flac? ( >=media-libs/flac-1.3.1[cxx] )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( >=media-sound/lame-3.70 )
-	lv2? (
-		media-libs/lilv
-		media-libs/lv2
-		media-libs/suil
-	)
-	mad? ( >=media-libs/libmad-0.14.2b )
-	sbsms? ( media-libs/libsbsms )
-	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-	twolame? ( media-sound/twolame )
-	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
-	"${FILESDIR}"/${PN}-2.3.3-fno-common.patch
-)
-
-src_prepare() {
-	default
-
-	use midi || sed -i \
-		-e 's:^\(#define EXPERIMENTAL_MIDI_OUT\):// \1:' \
-		src/Experimental.h || die
-}
-
-src_configure() {
-	setup-wxwidgets
-	append-cxxflags -std=gnu++14
-
-	# * always use system libraries if possible
-	# * options listed in the order that configure --help lists them
-	local myeconfargs=(
-		--disable-dynamic-loading
-		--enable-nyquist=local
-		--enable-unicode
-		--with-expat
-		--with-lib-preference=system
-		--with-libsndfile
-		--with-libsoxr
-		--with-mod-script-pipe
-		--with-mod-nyq-bench
-		--with-portaudio
-		--with-widgetextra=local
-		--with-wx-version=${WX_GTK_VER}
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable ladspa)
-		$(use_enable nls)
-		$(use_enable vst)
-		$(use_with ffmpeg)
-		$(use_with flac libflac)
-		$(use_with id3tag libid3tag)
-		$(use_with lame)
-		$(use_with lv2)
-		$(use_with mad libmad)
-		$(use_with midi portmidi local)
-		$(use_with midi "" local)
-		$(use_with portmixer)
-		$(use_with sbsms)
-		$(use_with soundtouch)
-		$(use_with twolame libtwolame)
-		$(use_with vamp libvamp)
-		$(use_with vorbis libvorbis)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Remove bad doc install
-	rm -r "${ED}"/usr/share/doc || die
-
-	# Install our docs
-	einstalldocs
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${WORKDIR}"/manual/{m,man,manual}
-		dodoc "${WORKDIR}"/manual/{favicon.ico,index.html,quick_help.html}
-		dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index a8acc69fa8ea..4c5130a8044f 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
 IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
 	portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
 
diff --git a/media-sound/audacity/files/audacity-2.2.1-portmixer.patch b/media-sound/audacity/files/audacity-2.2.1-portmixer.patch
deleted file mode 100644
index 0df43f5c07aa..000000000000
--- a/media-sound/audacity/files/audacity-2.2.1-portmixer.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/624264
-
-Patch by Vladimir
-
---- audacity-minsrc-2.2.1-rc3/configure.ac
-+++ audacity-minsrc-2.2.1-rc3/configure.ac
-@@ -540,7 +540,7 @@
-      [compile with PortMixer [default=yes]])],
-   use_portmixer=$withval,
-   use_portmixer="yes")
--
-+AM_CONDITIONAL([USE_PORTMIXER], [test "$use_portmixer" = yes])
- 
- AC_CANONICAL_HOST
- 
---- audacity-minsrc-2.2.1-rc3/lib-src/Makefile.am
-+++ audacity-minsrc-2.2.1-rc3/lib-src/Makefile.am
-@@ -92,7 +92,6 @@
- 	libsoxr \
- 	lib-widget-extra \
- 	lv2 \
--	portmixer \
- 	portsmf \
- 	sbsms \
- 	$(NULL)
-@@ -156,8 +155,10 @@
- SUBDIRS += portaudio-v19
- endif
- 
-+if USE_PORTMIXER
- # Note: portmixer needs to be linked against (the local or system) portaudio.
- SUBDIRS += portmixer
-+endif
- 
- if USE_LOCAL_PORTSMF
- SUBDIRS += portsmf
diff --git a/media-sound/audacity/files/audacity-2.2.2-automake.patch b/media-sound/audacity/files/audacity-2.2.2-automake.patch
deleted file mode 100644
index 56343e3ede21..000000000000
--- a/media-sound/audacity/files/audacity-2.2.2-automake.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Remove subdirs that are non-exisitng in the tarball
-or else autoreconf breaks.
-
---- audacity-minsrc-2.2.2-rc1/lib-src/Makefile.am
-+++ audacity-minsrc-2.2.2-rc1/lib-src/Makefile.am
-@@ -107,18 +107,6 @@
- SUBDIRS = FileDialog
- OPTIONAL_SUBDIRS =
- 
--if USE_LOCAL_EXPAT
--OPTIONAL_SUBDIRS += expat
--endif
--
--if USE_LOCAL_LIBID3TAG
--OPTIONAL_SUBDIRS += libid3tag
--endif
--
--if USE_LOCAL_LIBMAD
--OPTIONAL_SUBDIRS += libmad
--endif
--
- if USE_LOCAL_LIBNYQUIST
- SUBDIRS += libnyquist
- endif
-@@ -131,23 +119,10 @@
- OPTIONAL_SUBDIRS += libsoxr
- endif
- 
--if USE_LOCAL_LIBSOUNDTOUCH
--OPTIONAL_SUBDIRS += soundtouch
--endif
--
- if USE_LOCAL_LIBTWOLAME
- OPTIONAL_SUBDIRS += twolame
- endif
- 
--if USE_LOCAL_LIBVORBIS
--OPTIONAL_SUBDIRS += libogg libvorbis
--endif
--
--if USE_LOCAL_LIBFLAC
--# Note: libflac needs to be linked against (the local or system) libogg.
--OPTIONAL_SUBDIRS += libflac
--endif
--
- if USE_LOCAL_LV2
- SUBDIRS += lv2
- endif
diff --git a/media-sound/audacity/files/audacity-2.2.2-midi.patch b/media-sound/audacity/files/audacity-2.2.2-midi.patch
deleted file mode 100644
index 10a0f1f6eb04..000000000000
--- a/media-sound/audacity/files/audacity-2.2.2-midi.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-https://bugs.gentoo.org/637110
-
-Original patch by Matt Whitlock
-Forward-ported from version 2.2.0 to 2.2.2
-
---- audacity-minsrc-2.2.2-rc1/src/AudioIO.cpp
-+++ audacity-minsrc-2.2.2-rc1/src/AudioIO.cpp
-@@ -976,6 +976,7 @@
- };
- #endif
- 
-+#ifdef EXPERIMENTAL_MIDI_OUT
- // return the system time as a double
- static double streamStartTime = 0; // bias system time to small number
- 
-@@ -995,6 +996,7 @@
- 
-    return PaUtil_GetTime() - streamStartTime;
- }
-+#endif
- 
- const int AudioIO::StandardRates[] = {
-    8000,
-@@ -1803,6 +1805,7 @@
-    }
- #endif
- 
-+#ifdef EXPERIMENTAL_MIDI_OUT
-    // We use audio latency to estimate how far ahead of DACS we are writing
-    if (mPortStreamV19 != NULL && mLastPaError == paNoError) {
-       const PaStreamInfo* info = Pa_GetStreamInfo(mPortStreamV19);
-@@ -1811,6 +1814,7 @@
-       mAudioOutLatency = info->outputLatency;
-       mSystemMinusAudioTimePlusLatency += mAudioOutLatency;
-    }
-+#endif
- 
-    return (mLastPaError == paNoError);
- }
-@@ -1955,8 +1959,10 @@
- 
-    double playbackTime = 4.0;
- 
-+#ifdef EXPERIMENTAL_MIDI_OUT
-    streamStartTime = 0;
-    streamStartTime = SystemTime(mUsingAlsa);
-+#endif
- 
- #ifdef EXPERIMENTAL_SCRUBBING_SUPPORT
-    bool scrubbing = (options.pScrubbingOptions != nullptr);
-@@ -2830,7 +2836,9 @@
- 
-    mPlaybackTracks.clear();
-    mCaptureTracks.clear();
-+#ifdef HAVE_MIDI
-    mMidiPlaybackTracks.clear();
-+#endif
- 
- #ifdef EXPERIMENTAL_SCRUBBING_SUPPORT
-    mScrubQueue.reset();
-@@ -4669,13 +4677,13 @@
-          (float *)alloca(framesPerBuffer*numPlaybackChannels * sizeof(float)) :
-          (float *)outputBuffer;
- 
-+#ifdef EXPERIMENTAL_MIDI_OUT
-    if (gAudioIO->mCallbackCount++ == 0) {
-        // This is effectively mSystemMinusAudioTime when the buffer is empty:
-        gAudioIO->mStartTime = SystemTime(gAudioIO->mUsingAlsa) - gAudioIO->mT0;
-        // later, mStartTime - mSystemMinusAudioTime will tell us latency
-    }
- 
--#ifdef EXPERIMENTAL_MIDI_OUT
-    /* GSW: Save timeInfo in case MidiPlayback needs it */
-    gAudioIO->mAudioCallbackClockTime = PaUtil_GetTime();
- 
-@@ -5051,7 +5059,9 @@
-                   : gAudioIO->mTime >= gAudioIO->mT1))
-                   // PRL: singalling MIDI output complete is necessary if
-                   // not USE_MIDI_THREAD, otherwise it's harmlessly redundant
-+#ifdef EXPERIMENTAL_MIDI_OUT
-                   gAudioIO->mMidiOutputComplete = true,
-+#endif
-                   callbackReturn = paComplete;
-             }
-             
-@@ -5114,7 +5124,9 @@
- 
-                // PRL: singalling MIDI output complete is necessary if
-                // not USE_MIDI_THREAD, otherwise it's harmlessly redundant
-+#ifdef EXPERIMENTAL_MIDI_OUT
-                gAudioIO->mMidiOutputComplete = true,
-+#endif
-                callbackReturn = paComplete;
-             }
-          }
---- audacity-minsrc-2.2.2-rc1/src/Project.cpp
-+++ audacity-minsrc-2.2.2-rc1/src/Project.cpp
-@@ -460,10 +460,11 @@
-          } );
- 
-          for (const auto &name : sortednames) {
--
-+#ifdef USE_MIDI
-             if (Importer::IsMidi(name))
-                AudacityProject::DoImportMIDI(mProject, name);
-             else
-+#endif
-                mProject->Import(name);
-          }
- 
-@@ -3046,9 +3047,11 @@
- #endif
- 
-       {
-+#ifdef USE_MIDI
-          if (Importer::IsMidi(fileName))
-             DoImportMIDI(this, fileName);
-          else
-+#endif
-             Import(fileName);
- 
-          ZoomAfterImport(nullptr);
---- audacity-minsrc-2.2.2-rc1/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp
-+++ audacity-minsrc-2.2.2-rc1/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp
-@@ -9,6 +9,9 @@
- **********************************************************************/
- 
- #include "../../../../Audacity.h"
-+
-+#ifdef USE_MIDI
-+
- #include "NoteTrackButtonHandle.h"
- 
- #include "../../../../HitTestResult.h"
-@@ -113,3 +116,4 @@
-    return RefreshCode::RefreshNone;
- }
- 
-+#endif
---- audacity-minsrc-2.2.2-rc1/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
-+++ audacity-minsrc-2.2.2-rc1/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
-@@ -9,6 +9,9 @@
- **********************************************************************/
- 
- #include "../../../../Audacity.h"
-+
-+#ifdef USE_MIDI
-+
- #include "NoteTrackVZoomHandle.h"
- #include "../../../../Experimental.h"
- #include "NoteTrackVRulerControls.h"
-@@ -332,3 +335,5 @@
-       TrackVRulerControls::DrawZooming
-          ( dc, mRect, panelRect, mZoomStart, mZoomEnd );
- }
-+
-+#endif
---- audacity-minsrc-2.2.2-rc1/src/tracks/ui/TimeShiftHandle.cpp
-+++ audacity-minsrc-2.2.2-rc1/src/tracks/ui/TimeShiftHandle.cpp
-@@ -604,7 +604,7 @@
-       {
-          trySnap = true;
-          if (pTrack->GetKind() == Track::Wave) {
--            auto wt = static_cast<const WaveTrack *>(pTrack);
-+            auto wt = static_cast<const WaveTrack *>(pTrack.get());
-             const double rate = wt->GetRate();
-             // set it to a sample point
-             desiredSlideAmount = rint(desiredSlideAmount * rate) / rate;
diff --git a/media-sound/audacity/files/audacity-2.3.3-fno-common.patch b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
deleted file mode 100644
index 5b922638aa5c..000000000000
--- a/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From bcb460e5a9af2088d8081577b324ec20d0069ed8 Mon Sep 17 00:00:00 2001
-From: Leland Lucius <github@homerow.net>
-Date: Mon, 16 Dec 2019 00:59:33 -0600
-Subject: [PATCH] Misc changes to get new Nyquist to build
-
-[backport of bd6ec9c0ed9fe94ae2f6e171969ae8a9fe45c11d]
----
- lib-src/libnyquist/nyquist/cmt/cmtio.h   | 4 ++--
- lib-src/libnyquist/nyquist/cmt/userio.c  | 4 ++++
- lib-src/libnyquist/nyquist/sys/unix/io.c | 6 +++---
- 3 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/lib-src/libnyquist/nyquist/cmt/cmtio.h b/lib-src/libnyquist/nyquist/cmt/cmtio.h
-index 3e50ad957..232862b50 100644
---- a/lib-src/libnyquist/nyquist/cmt/cmtio.h
-+++ b/lib-src/libnyquist/nyquist/cmt/cmtio.h
-@@ -1,7 +1,7 @@
- #define NOCHAR -2
- 
--int IOinputfd;
--int IOnochar;
-+extern int IOinputfd;
-+extern int IOnochar;
- 
- int IOsetup(int inputfd);
- int IOcleanup(void);
-diff --git a/lib-src/libnyquist/nyquist/cmt/userio.c b/lib-src/libnyquist/nyquist/cmt/userio.c
-index f442376c5..a33ac98c9 100644
---- a/lib-src/libnyquist/nyquist/cmt/userio.c
-+++ b/lib-src/libnyquist/nyquist/cmt/userio.c
-@@ -153,6 +153,10 @@ extern int debug;
- #include "xlisp.h"
- #endif
- 
-+int     IOinputfd;      /* input file descriptor (usually 0) */
-+
-+int     IOnochar;       /* Value to be returned by IOgetchar()
-+                           where there is no input to be had */
- 
- /****************************************************************************
- *
-diff --git a/lib-src/libnyquist/nyquist/sys/unix/io.c b/lib-src/libnyquist/nyquist/sys/unix/io.c
-index 21b2abed8..f3e499c0d 100644
---- a/lib-src/libnyquist/nyquist/sys/unix/io.c
-+++ b/lib-src/libnyquist/nyquist/sys/unix/io.c
-@@ -16,10 +16,10 @@
- #include <sgtty.h>
- #include "cext.h"
- 
--int     IOinputfd;      /* input file descriptor (usually 0) */
-+extern int     IOinputfd;      /* input file descriptor (usually 0) */
- 
--int     IOnochar;       /* Value to be returned by IOgetchar()
--                   where there is no input to be had */
-+extern int     IOnochar;       /* Value to be returned by IOgetchar()
-+                                  where there is no input to be had */
- 
- static  struct sgttyb IOoldmodes, IOcurrentmodes;
-                 /* Initial and current tty modes */
--- 
-2.24.1
-
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index 7f3a6ec835ae..2457f6d4ce87 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -13,14 +13,11 @@
   <use>
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
     <flag name="lv2">Add support for Ladspa V2</flag>
-    <flag name="midi">Enables MIDI support</flag>
     <flag name="portmidi">Enable support for MIDI via media-libs/portmidi</flag>
     <flag name="portmixer">Enable the internal portmixer feature</flag>
     <flag name="portsmf">Enable support for Portable Standard Midi File Library</flag>
     <flag name="sbsms">Enables sbsms library support for slower, more accurate
       pitch and tempo changing</flag>
-    <flag name="soundtouch">Enables soundtouch library support for pitch and
-      tempo changing</flag>
     <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag>
     <flag name="vamp">Enables vamp plugins support (Audio analysing plugins)</flag>
     <flag name="vst">Enable VST plugin support</flag>
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 0d7b8ddc425e..a67a08d6db5d 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,8 +1,10 @@
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
-AUX bluealsa-init.d 365 BLAKE2B e94570ce6b6e25b0c9e2d2aec573c1b4a698d94117825b3708c1e046808787f97f2ef0d5bb0b1aa87910bbc33bbd9b997b6c30b90940d40fa9acd3e31505848d SHA512 b8d6b81e6ea0480975685396a3fbc349d6da7dc5a5c386271b1facdfc91ed0c2ffa79e1f78b54b530b28d413ff786ad1578ab504875905499dc5f8f075641f4d
+AUX bluealsa-init.d 357 BLAKE2B cca746c0370c728fcf4e5ca977fb358bbc54fa1bc74df4cdf2b790dfa63e03c039cd507b7e6d254a8109bcfda9d82dc3b9d0b42b404c375f73431d701c1ae380 SHA512 b268dea4662dcd8488a7c787d5e14a6bdb2208fa3db573ae6c71ff96906be4d1b43f98c8a7fd0f8bbe2b95b9493cf1306aac48e675c0635ce03c267c2abd63c1
 AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac435836f5b20056deac75cbfd9828bd2fe22ea30e544e2846f61be1194c555a166303514bbb48e4107a SHA512 108a86070b215d16e092c0f8fb869c969bc99b6aa479cb81c894fc6ae0c9e16655b14da27ee49c7f50549e4de7aa43a855954cc0dfe7430cdcf8822a97a4d889
 AUX bluez-alsa-2.1.0-gcc10.patch 4802 BLAKE2B f57c2920deaec93bf57e56440c20f01a23e58300e062f9d8f83b56719cbc8620dfac8e1420639db7cabc589a231e9f33ff6f2de6e8ad7ba9b2d9b2c18fa35b32 SHA512 e26c4cf6b4184c99ba85f9640f5f5db38ae66999560147af91aff1d9aebb10ef534dd631f8a8421164431401ee2a35da529c298deff6b955bd6747fc7a9f5605
 DIST bluez-alsa-2.1.0.tar.gz 129650 BLAKE2B 6ab1b618828b5ad6f35c62a711cd24a51536ae4e013227addff8193bb522e0e7322d054fa8e688b5322ec59f6d08a654760ebb5792a637fa11536afc41c5dba5 SHA512 8b6d520f5733799b1c509052ac527377cbe5e0106b75180f783f83071246937b5dc7a22c2d27f3e9e331c52c74be59f3bc6d78caab97b41f06cfd6ed5191b584
+DIST bluez-alsa-3.0.0.tar.gz 157776 BLAKE2B 68cc67dcfd303e624333d7dafa53a3ce0f91f55e58a9a1a51f17153eadfdca5acc1b12b2e41a11c4780909fe8283e0a9c859a7d755e38dd9aeebbf4ae9e0daf2 SHA512 094c91636c3f1803b3eb88e295683acc604be9f86d00022c196784b4ec88aa4a6cc20bdff0fdab2a7e5af3efe95ed8bd8c5486a8cd7896ec572bfa9e8e0f13d0
 EBUILD bluez-alsa-2.1.0-r1.ebuild 2105 BLAKE2B 6afd74d6e52478e52201bebf5b9a9991d8106488f090049361771824912f475f02653b8b8e56718a559fcd0135a1a0191d0bfe86bb66a40684f0c1ef138a478f SHA512 0e822dc45450a35fad11568875d45908e0db49bdf9fa21fe205481cbd1189902d900e808a6ede91b56ab7f5fb6c3e7a138fb9cde2b15e1e43fa1636c2aa98362
-EBUILD bluez-alsa-9999.ebuild 2052 BLAKE2B 11d92d789735a86e632958151f86da7dbf1636eb445739313abbb2917be6c356e4f86b09be23203e0b5322d31f08c88db4ed3ef408500d646c558efde6d96a4a SHA512 918776dc7e26d5bbef9863c5345e05701b5b2f7d400980a7b7a90cbc117800a9dc4209f394bf5c10d6a00ef06f4942f9982693905cadf7a0de6e4e0a349d9ae5
-MISC metadata.xml 583 BLAKE2B 169737f9ae65bf26204a56b0fbcd1479911895ccfc20433c01a8ea1711ceb75939531f395f7e882149ffde427f43d8410d19392040e5288f5dbca2e4f86fa71f SHA512 b767355e099b5c60ad8d439ba7db224a11638a3fca4a7cd7b3efaa3152a0660ca96176a08d8e352fece334e7a48cebcce555fe12cf9959749491eed360772054
+EBUILD bluez-alsa-3.0.0.ebuild 2411 BLAKE2B ccccdb60eb19beb197eefd666298e63ba80df644179b0fdb08ca3555dac165393b416799e0b9d02489c6fb33cc2c9faa4096d90a15c182acd68a1e076c33e2b0 SHA512 6b2693c9de7acf55c4f614df6a24d3eda0180da00f951b9c8cf58ce4e14e3e33fb662c595cf07309d094188e3d59f177ea997b1a6c0a709148c5c14875124952
+EBUILD bluez-alsa-9999.ebuild 2411 BLAKE2B ccccdb60eb19beb197eefd666298e63ba80df644179b0fdb08ca3555dac165393b416799e0b9d02489c6fb33cc2c9faa4096d90a15c182acd68a1e076c33e2b0 SHA512 6b2693c9de7acf55c4f614df6a24d3eda0180da00f951b9c8cf58ce4e14e3e33fb662c595cf07309d094188e3d59f177ea997b1a6c0a709148c5c14875124952
+MISC metadata.xml 780 BLAKE2B ac2e3d17efbdf9a80db3e6b58b47438931483a3ea4de163d171ee03157bb1d940d4b720b63d645011bb5cdfd89ef05574593501f79402cf5d64e1d19138231f6 SHA512 e6a7a33cf5da26f96d49bad352a26ae08665ade39ac1b676c1a4dcbd815116ce65fa5f9d788ec668e393a4c1fe3a4d6092a3d9a8c8404eed6017dfaa3afbfd29
diff --git a/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
new file mode 100644
index 000000000000..3ab8343e3815
--- /dev/null
+++ b/media-sound/bluez-alsa/bluez-alsa-3.0.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal systemd
+
+DESCRIPTION="Bluetooth Audio ALSA Backend"
+HOMEPAGE="https://github.com/Arkq/bluez-alsa"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
+else
+	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="aac debug hcitop lame ldac man mpg123 ofono static-libs test unwind upower"
+RESTRICT="!test? ( test )"
+
+# bluez-alsa does not directly link to upower but
+# is using the upower interface via dbus calls.
+RDEPEND="
+	>=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
+	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
+	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
+	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
+	lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
+	mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+	hcitop? (
+		dev-libs/libbsd
+		sys-libs/ncurses:0=
+	)
+	ldac? ( >=media-libs/libldac-2.0.0 )
+	ofono? ( net-misc/ofono )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	upower? ( sys-power/upower )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+BDEPEND="
+	virtual/pkgconfig
+	man? ( app-text/pandoc )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-rfcomm
+		$(use_enable aac)
+		$(use_enable debug)
+		$(use_enable lame mp3lame)
+		$(use_enable man manpages)
+		$(use_enable mpg123)
+		$(use_enable static-libs static)
+		$(use_enable test)
+		$(multilib_native_use_enable hcitop)
+		$(multilib_native_use_enable ldac)
+		$(multilib_native_use_enable ofono)
+		$(multilib_native_use_enable upower)
+		$(use_with unwind libunwind)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
+	systemd_dounit "${FILESDIR}"/bluealsa.service
+
+	# Add config file to alsa datadir as well to preserve changes in /etc
+	insinto "/usr/share/alsa/alsa.conf.d/"
+	doins "src/asound/20-bluealsa.conf"
+}
+
+pkg_postinst() {
+	elog "Users can use this service when they are members of the \"audio\" group."
+}
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 35b7533e4c48..3ab8343e3815 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop ldac ofono static-libs test upower"
+IUSE="aac debug hcitop lame ldac man mpg123 ofono static-libs test unwind upower"
 RESTRICT="!test? ( test )"
 
 # bluez-alsa does not directly link to upower but
@@ -30,16 +30,23 @@ RDEPEND="
 	sys-apps/dbus[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
 	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
+	lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
+	mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
 	hcitop? (
 		dev-libs/libbsd
 		sys-libs/ncurses:0=
 	)
 	ldac? ( >=media-libs/libldac-2.0.0 )
+	ofono? ( net-misc/ofono )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 	upower? ( sys-power/upower )
 "
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+	man? ( app-text/pandoc )
+"
 
 src_prepare() {
 	default
@@ -51,12 +58,16 @@ multilib_src_configure() {
 		--enable-rfcomm
 		$(use_enable aac)
 		$(use_enable debug)
-		$(use_enable ofono)
+		$(use_enable lame mp3lame)
+		$(use_enable man manpages)
+		$(use_enable mpg123)
 		$(use_enable static-libs static)
 		$(use_enable test)
 		$(multilib_native_use_enable hcitop)
 		$(multilib_native_use_enable ldac)
+		$(multilib_native_use_enable ofono)
 		$(multilib_native_use_enable upower)
+		$(use_with unwind libunwind)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
diff --git a/media-sound/bluez-alsa/files/bluealsa-init.d b/media-sound/bluez-alsa/files/bluealsa-init.d
index 087b35386eb6..f85b822c53e3 100644
--- a/media-sound/bluez-alsa/files/bluealsa-init.d
+++ b/media-sound/bluez-alsa/files/bluealsa-init.d
@@ -2,7 +2,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-pidfile="/var/run/bluealsa.pid"
+pidfile="/run/bluealsa.pid"
 command="/usr/bin/bluealsa"
 command_args="${BLUEALSA_CONF}"
 command_background="true"
@@ -13,5 +13,5 @@ depend() {
 }
 
 start_pre() {
-	checkpath -q -D -m 0770 -o :audio /var/run/bluealsa
+	checkpath -q -D -m 0770 -o :audio /run/bluealsa
 }
diff --git a/media-sound/bluez-alsa/metadata.xml b/media-sound/bluez-alsa/metadata.xml
index 4fa05b5a0f0c..cf14e256b358 100644
--- a/media-sound/bluez-alsa/metadata.xml
+++ b/media-sound/bluez-alsa/metadata.xml
@@ -11,6 +11,8 @@
   <use>
     <flag name="hcitop">Enable top-like monitoring tool for HCI</flag>
     <flag name="ldac">Enable support for AOSP <pkg>media-libs/libldac</pkg> dispatcher</flag>
+    <flag name="man">Generate (and install) man pages with <pkg>app-text/pandoc</pkg></flag>
+    <flag name="mpg123">Enable support for MPEG audio playback via <pkg>media-sound/mpg123</pkg></flag>
     <flag name="ofono">Enable ofono elephony support</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index e8c2ba3e7392..4c27edc5e5ad 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,4 +1,6 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
 DIST cantata-2.4.1.tar.bz2 2550982 BLAKE2B 1d965ce4a5a73d4695b51def9753c95376b71367f2e6abf69681aad84e387d86d87abcf623f613a517e5e08a633e4e9bf2bae2d28858535fac2f05ade73a6c01 SHA512 9bb9953f41ad562e186c201505db6ea42dccdcb0b60e0c6eda0c5521428ecafdba95b51e8827de3498b2b25284d36f800bfa96a49839d2a69e0f92705f44a439
+DIST cantata-2.4.2.tar.bz2 2498460 BLAKE2B 82486a644fa90567f2c1c997645817d9adee841b79fb782c4984143a0ef25758e8b6605de86eed1c09b2b63b9d570adc0c647245c5e0e900652c0444671c67a7 SHA512 c2459a53d86e12df7e6a8f7c19880f1c353c13893401a0906ec730c34ccbf1ef070c226b55c4e772e9a54a94e7cf3a2f96b0e9223ff20057045c888c4f91d87b
 EBUILD cantata-2.4.1.ebuild 3020 BLAKE2B 090c658ea3a956a1bf37508d79a36fb607233f81f8861b01812292c8c760ad2c24ffb76ac56ee87bc56997c99a65c6d4762641c023776e7453571db185014b93 SHA512 5801447e3346cece5c6494cf1c3ba20a55f53a73efef8e4658f95184611ac015f4b0b671b706d0bdec1d1c4f1f93dd7e96415c0ecd147a99eb49fdf521dd4b75
+EBUILD cantata-2.4.2.ebuild 3028 BLAKE2B b9e6980eb68959b3b25c7c7452b48f683736677984aa9b1116d1547737678be792bd154ed0c1c8757cf76d64e0e1b8d6aa11548e8cf00d0e25fed0e7ce597713 SHA512 4a1a0b481f9538b62e5e78d87fb211c4b122094bf511cc40aa8940b0abf448e1c2dccf288838f6819b7c07d847d364ccbe84ac235ed5c0047b0f56b2bc798953
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.4.2.ebuild b/media-sound/cantata/cantata-2.4.2.ebuild
new file mode 100644
index 000000000000..d4dca81aed02
--- /dev/null
+++ b/media-sound/cantata/cantata-2.4.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ru zh_CN"
+inherit cmake l10n qmake-utils xdg
+
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
+HOMEPAGE="https://github.com/CDrummond/cantata"
+SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf"
+REQUIRED_USE="
+	?? ( cdda cdio )
+	cdda? ( udisks || ( cddb musicbrainz ) )
+	cddb? ( || ( cdio cdda ) taglib )
+	cdio? ( udisks || ( cddb musicbrainz ) )
+	mtp? ( taglib udisks )
+	musicbrainz? ( || ( cdio cdda ) taglib )
+	replaygain? ( taglib )
+"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	virtual/libudev:=
+	cdda? ( media-sound/cdparanoia )
+	cddb? ( media-libs/libcddb )
+	cdio? ( dev-libs/libcdio-paranoia:= )
+	mtp? ( media-libs/libmtp:= )
+	musicbrainz? ( media-libs/musicbrainz:5= )
+	replaygain? (
+		media-libs/libebur128:=
+		media-sound/mpg123
+		media-video/ffmpeg:0=
+	)
+	streaming? ( dev-qt/qtmultimedia:5 )
+	taglib? (
+		media-libs/taglib[asf(+),mp4(+)]
+		udisks? ( sys-fs/udisks:2 )
+	)
+	zeroconf? ( net-dns/avahi )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl[ithreads]
+	|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtconcurrent:5
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" )
+
+src_prepare() {
+	remove_locale() {
+		rm "translations/${PN}_${1}".ts || die
+	}
+
+	cmake_src_prepare
+
+	# Unbundle 3rd party libs
+	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
+
+	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
+	l10n_for_each_disabled_locale_do remove_locale
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
+		-DENABLE_CDPARANOIA=$(usex cdda)
+		-DENABLE_CDDB=$(usex cddb)
+		-DENABLE_CDIOPARANOIA=$(usex cdio)
+		-DENABLE_HTTP_SERVER=$(usex http-server)
+		-DENABLE_MTP=$(usex mtp)
+		-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
+		-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+		-DENABLE_FFMPEG=$(usex replaygain)
+		-DENABLE_MPG123=$(usex replaygain)
+		-DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
+		-DENABLE_TAGLIB=$(usex taglib)
+		-DENABLE_DEVICES_SUPPORT=$(usex udisks)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_REMOTE_DEVICES=OFF
+		-DENABLE_UDISKS2=ON
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	has_version media-sound/mpd || \
+		elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata."
+
+	if ! has_version app-misc/media-player-info; then
+		elog "Install app-misc/media-player-info to enable identification"
+		elog "and querying of portable media players"
+	fi
+}
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 4e6b590ab5f1..9f0cb163810d 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,13 +1,9 @@
 AUX csound-6.13.0-xdg-open.patch 982 BLAKE2B e6643fc554feb8b0fd4cbb4d96e6ca727bf04da998b61df515e090fc0784ce9c2fbe0b67ce45da83d36838cc57de6de5f176d38c322b1586264a527b1b44fe09 SHA512 e141beafdd2a93bbd7bd0a12c71e1dc3ffd2c67558c3e7e47a24298aefe6197bbde179d2bfc7e82e78bdffac1c889d43789a17e364785e9892bd35306fa07c6a
 AUX csound-6.15.0-lame.patch 737 BLAKE2B 5febfbd58a9f4591f2ac06fbdc311552d18153cec7d3f5923d14319eea02ad69d75277aaa75a06ad02bd23d2d24a9913f7bb9719456ef98c487e93091b841278 SHA512 2e71e5c46b78e8867257ee86e70072f3c2e7f6021e67d0a3381cbc8226cb7deb023b8ffc1d047628ec527da6fc383a55ce310402c5ecc2696ff36250ecf7081d
 AUX repackage.sh 738 BLAKE2B 4e091a526c4402354be54ca4e161eef4ec74adf8e0d218985426e9ba9a808399fb4b8973d9acce3063c968fca561a1429035b01e85588e99c0135521f92ea96c SHA512 fa418daaddcce4f5296596038726720675ad9988f57bbcd943bf2f247fd8368401a193c031ab65bea5753b37274f41cb9bf28dd2b18309bd0cee90b931d2fab1
-DIST Csound6.14.0_manual_html.zip 17081006 BLAKE2B 9565c21623a60e06aae82bfbde186e496b5f3ae0eb619289a7db08235c7dcd520bee2283552fdf2ddb4eb85c7b0f184397d2fa0ee14d3bdeff9dccb44a7d7ff1 SHA512 638ecd8bc0b4c981e1f8c5592a123a3b1bb5582ee7017288be224eb670fccda79242ae42b6f6d8e91c2ad2f708af1de3c66283030d4b3373c0ec29ec260f379b
-DIST Csound6.14.0_manual_pdf.zip 8881242 BLAKE2B a91a3689dd3efa5c32c924178b646b73787132a07575f05a65ee1acafc69108ce6c33512e0b703012f75f201a86a0b84e08976f158b01ef5201807d1aaa31c35 SHA512 55769acd58add0ec6df5e188c74e16424deb679aebdbdd50dc5d9006c80a26c31dfe2564e5d71478abcb7a920b40c1f1baa02e4c3fd682a6d3bbc378ddcb8b7d
 DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1 SHA512 cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
 DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e SHA512 0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
-DIST csound-6.14.0-distributable.tar.xz 21114184 BLAKE2B ebcdff074d77fd6244875a3ccb6c0dc6364b6f3ae0ca0de75cc8ad893c91a30f17237bf7f1b06296f7141d2c9092594dea75b7539f033574bec7c8f36aaf9251 SHA512 21e857a363962c95f0b7702ce8a07713e56b267dae51f2c50d34ae8885f89e2ad0e241e84927d649912cddffeaecc6bfef15ef8958ffb621d825f4547c3632f8
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
-EBUILD csound-6.14.0.ebuild 7348 BLAKE2B ce6e6ceaaece2796ce8ae758bc6638baf18df4429a04c6af949c42ddecb311166ae2fa004488ce8f0b1d46ce32e0ebbea9c351c6dbc22dbc8cab13ba5caca54f SHA512 f794e00b7b63ac98c98a49f1a88912c7a7ebd740b8d9d51f02c92060dbb0192d36f69a4aef1494a22dc8f72975273eb626ed68ff62600ef71a0eaa1dd9726302
-EBUILD csound-6.15.0.ebuild 7356 BLAKE2B 8e6082be3939068e32f20ca3de55fe67a93639c203e9fb29ed86b415d766bfc9f9509767d9be86135032dc896b909ff06648f4d913cbcc2dfaad8d12750ae5ba SHA512 ba20b3813545fa79eb1a75974df8d980b76780eb4e5acb3861731f01dc769b9542218091accdcd289ab09b6da3dc99d26d65864a0783e1a2c129c8869c0b7fb1
+EBUILD csound-6.15.0.ebuild 7354 BLAKE2B dbbf46fcfc64cb104696278cd59881c00da45d945a1b52239e8ee9e608bcb1df0b9344615d05b005120ff47fbfabd4bad18c66df8c29a3418018c3ef03296e1c SHA512 48cafb98a4646d7b56929bdb44ff0bb6ff6abbd1b47e99f460dc7151cbe0cccc3bc57db1d04ae94c2ad44a46823a2a347957ee6d4c655c90650cc90bc4784694
 EBUILD csound-9999.ebuild 7356 BLAKE2B 8e6082be3939068e32f20ca3de55fe67a93639c203e9fb29ed86b415d766bfc9f9509767d9be86135032dc896b909ff06648f4d913cbcc2dfaad8d12750ae5ba SHA512 ba20b3813545fa79eb1a75974df8d980b76780eb4e5acb3861731f01dc769b9542218091accdcd289ab09b6da3dc99d26d65864a0783e1a2c129c8869c0b7fb1
 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
diff --git a/media-sound/csound/csound-6.14.0.ebuild b/media-sound/csound/csound-6.14.0.ebuild
deleted file mode 100644
index 389c8227528a..000000000000
--- a/media-sound/csound/csound-6.14.0.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/csound/csound.git"
-	inherit git-r3
-else
-	DOC_P="Csound${PV}"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
-		doc? (
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-		)"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and performance"
-HOMEPAGE="https://csound.github.io/"
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-# java doesn't work atm as it needs to have some variables specified to work, see src_configure
-# mp3 doesnt work as media-sound/lame does not install cmake file
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
-vim-syntax websocket"
-
-REQUIRED_USE="
-	linear? ( double-precision )
-	lua? ( cxx )
-	python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-#	java? ( cxx )
-
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
-	python? ( dev-lang/swig )
-	nls? ( sys-devel/gettext )
-	test? (
-		dev-util/cunit
-		${PYTHON_DEPS}
-	)
-"
-# linear currently works only with sci-mathematics-gmm-5.1
-#   https://github.com/csound/csound/issues/920
-# currently not used deps due to some issues
-#	java? ( virtual/jdk:* )
-#	mp3? ( media-sound/lame )
-CDEPEND="
-	dev-cpp/eigen:3
-	>=media-libs/libsndfile-1.0.16
-	media-libs/libsamplerate
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dssi? (
-		media-libs/dssi
-		media-libs/ladspa-sdk
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	hdf5? ( sci-libs/hdf5 )
-	image? ( media-libs/libpng:0= )
-	jack? ( virtual/jack )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( =sci-mathematics/gmm-5.1* )
-	lua? (
-		luajit? ( dev-lang/luajit:2 )
-		!luajit? ( dev-lang/lua:0 )
-	)
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	stk? ( media-libs/stk )
-	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets:= )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="
-	${CDEPEND}
-	dev-libs/boost
-"
-
-if [[ ${PV} != "9999" ]]; then
-	DEPEND+="doc? ( app-arch/unzip )"
-fi
-
-# requires specific alsa settings
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
-)
-
-pkg_setup() {
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-		-e '/-O3/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_BELA=OFF
-		-DBUILD_BUCHLA_OPCODES=ON
-		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_CSBEATS=$(usex beats)
-		-DBUILD_CUDA_OPCODES=OFF
-		-DBUILD_CXX_INTERFACE=$(usex cxx)
-		-DBUILD_DSSI_OPCODES=$(usex dssi)
-		-DBUILD_EMUGENS_OPCODES=ON
-		-DBUILD_EXCITER_OPCODES=ON
-		-DBUILD_FAUST_OPCODES=OFF
-		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DBUILD_FRAMEBUFFER_OPCODES=ON
-		-DBUILD_HDF5_OPCODES=$(usex hdf5)
-		-DBUILD_IMAGE_OPCODES=$(usex image)
-		-DBUILD_INSTALLER=OFF
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=OFF
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DBUILD_MP3OUT_OPCODE=OFF
-		-DBUILD_MULTI_CORE=$(usex threads)
-		-DBUILD_OPENCL_OPCODES=OFF
-		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DBUILD_P5GLOVE_OPCODES=OFF
-		-DBUILD_PADSYNTH_OPCODES=ON
-		-DBUILD_PLATEREV_OPCODES=ON
-		-DBUILD_PVSGENDY_OPCODE=OFF
-		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DBUILD_PYTHON_OPCODES=$(usex python)
-		-DBUILD_RELEASE=ON
-		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
-		-DBUILD_SELECT_OPCODE=ON
-		-DBUILD_SERIAL_OPCODES=ON
-		-DBUILD_STACK_OPCODES=ON
-		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
-		-DBUILD_STK_OPCODES=$(usex stk)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_UTILITIES=$(usex utils)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_VST4CS_OPCODES=OFF
-		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-		-DBUILD_WIIMOTE_OPCODES=OFF
-		-DBUILD_WINSOUND=OFF
-
-		-DFAIL_MISSING=ON
-		-DNEED_PORTTIME=OFF
-		-DNEW_PARSER_DEBUG=$(usex debug)
-
-		-DUSE_ALSA=$(usex alsa)
-		#-DUSE_ATOMIC_BUILTIN=ON
-		-DUSE_AUDIOUNIT=OFF # Apple specific
-		#-DUSE_COMPILER_OPTIMIZATIONS=ON
-		-DUSE_COREMIDI=OFF # Apple specific
-		-DUSE_CURL=$(usex curl)
-		-DUSE_DOUBLE=$(usex double-precision)
-		-DUSE_FLTK=$(usex fltk)
-		-DUSE_GETTEXT=$(usex nls)
-		-DUSE_GIT_COMMIT=ON
-		_DUSE_IPMIDI=ON
-		-DUSE_JACK=$(usex jack)
-		-DUSE_LRINT=ON
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PORTMIDI=$(usex portmidi)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-
-	)
-
-	#use java && mycmakeargs+=(
-		#-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
-		#-DJAVA_AWT_LIBRARY="?"
-		#-DJAVA_JVM_LIBRARY="?"
-		#-DJAVA_INCLUDE_PATH2="?"
-		#-DJAVA_AWT_INCLUDE_PATH="?"
-	#)
-
-	# set the library that we want to use
-	if use lua ; then
-		local libdir
-		local libname
-
-		if use luajit ; then
-			libdir=$(pkg-config --variable=libdir luajit)
-			libname=$(pkg-config --variable=libname luajit)
-		else
-			libdir=$(pkg-config --variable=libdir lua)
-			libname=$(pkg-config --variable=libname lua)
-			[[ -z "${libname}" ]] && libname="lua"
-		fi
-
-		mycmakeargs+=(
-			-DLUA_LIBRARY="${libdir}/lib${libname}.so"
-		)
-	fi
-
-	use python && mycmakeargs+=(
-		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
-	# this is needed, otherwise it sets LIBRARY INSTALL DIR: lib
-	[[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
-		-DUSE_LIB64=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc -r Release_Notes/.
-
-	# generate env.d file
-	cat > "${T}"/62${PN} <<-_EOF_ || die
-		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
-		CSSTRNGS="${EPREFIX}/usr/share/locale"
-	_EOF_
-	if use stk ; then
-		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
-	fi
-	doenvd "${T}"/62${PN}
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{,csound_}extract || die
-
-	use python && python_optimize
-
-	# install docs
-	if [[ ${PV} != "9999" ]] && use doc ; then
-		dodoc "${WORKDIR}"/*.pdf
-		dodoc -r "${WORKDIR}"/html
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}
diff --git a/media-sound/csound/csound-6.15.0.ebuild b/media-sound/csound/csound-6.15.0.ebuild
index b52669444ab9..da75681bf4b4 100644
--- a/media-sound/csound/csound-6.15.0.ebuild
+++ b/media-sound/csound/csound-6.15.0.ebuild
@@ -20,7 +20,7 @@ else
 			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
 			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
 		)"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and performance"
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 36bc1c39fb3a..e016420e84ec 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,12 +1,9 @@
 AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
 AUX hydrogen-1.0.0-i18n-path.patch 455 BLAKE2B 099fe7bae1d7a9e5cf7eb8b7fc650f0421c91d0170b7ef3577d0b5249fa23fd71e802d8edd8ac80f9c2487473f9b7aa4a84b912d8fe8f3e4de6d2a5e418ab219 SHA512 cb96acb38f37803676be410082009ca7e0e0e6f83cbfb9d519c0f83212caa903891db12275201ab0395bde5edf1204508f81c45e9ea3e49ae33834719d277517
-AUX hydrogen-1.0.0_rc1-gnuinstalldirs.patch 1240 BLAKE2B 165cc1e6706a95c57d9ebcac7689c5725fbbe3c72eca8d0b960ade48b09b0c9e38b2750319f022075427c308cf55f5cf06f5c8203e02ecb999bc5695ff4cd0c3 SHA512 d48380e4ed620dd3e5cc508c9a90224b59b9d1b57b80fbfc42d6991bfc14ddab47c3082831bf8356f701c97fee48ff326f64a7c04becb9bb86b0a58b5d358a23
 AUX hydrogen-9999-i18n-path.patch 457 BLAKE2B dde2e8b80ca79f52c05a2512d2d07333cb118c96da92326716533c27908fd68dfb5159a8015a2e3347bb20cc7be96217bba09ec1833cdef06d4d3c2ace8d4aae SHA512 85f974df6d490650562a34dbb4dc126d6b67c85bdf1e91303967714738999a9299e64fdac3492d1b7da4bbccfb1773972888840f54327dba3b4efb0671023841
 DIST hydrogen-1.0.0.tar.gz 11501728 BLAKE2B ccb48cddff2b196e934c712f999109ae4b91513579ec123e57f2ef9f6aa288c1408208bde8608a908e58650c741260fbcc1108dabd7968687d74e4c143fb7de3 SHA512 68a7634a63d409ff8eef789bb9dd86b65535e17b6101fe1e1bd0153cab4852dc2cfa7ff11b2cfddbead337d2faad9ca4c49eed589c47c09aa5f5aa91c59171a7
-DIST hydrogen-1.0.0_rc1.tar.gz 11502829 BLAKE2B 2d529c94713f415af1b183ff8dd11d05111da1cfac130eea749aaa5c5fa941bc69b172bdc77cf755ad3a34617609af28690cd94bc975feab3ecb06af6e7965f8 SHA512 1615956ed02cfc0553ff09b651f76cb56dd35ec314a535fcb97f9658eebb6eee3eba884779b097767b404c82d6e074e2df342bdaabce77a47ad8278bd18be1be
 DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c SHA512 66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
-EBUILD hydrogen-1.0.0.ebuild 2128 BLAKE2B 11928a6b08edc2554eaf268f880242138c59d3aa8f65630285c3c829cf9045b5b0f04e1b058b14c5aae9a8544ee5c2d7acc2a292b3636046140c3b56e30ee580 SHA512 ca431970707511c68541220a97b0dd3d70946d2f2f4e6845a72674fe136e8314aad1c020bc909e27f5b96ca894bc9d6ed1830cc3303fee200812ad0bccdafeb1
-EBUILD hydrogen-1.0.0_rc1-r1.ebuild 2104 BLAKE2B 68108e4fe3b357713cc567f819634cf5a535abff1e365f6952e76218cfe5fdeb86b74e173649b306c8e209b3cfdac24c385e1babf5e163b8da16a69a2f3f04f7 SHA512 db6ebcd97acb754f004f19bb98951b0c7f5703489a6f6881fef1edea64a9230b7a25b671a7919d1e1a1d82dd8d355e9d7b04c8b55d49e38b129574a3cf508c1f
+EBUILD hydrogen-1.0.0.ebuild 2141 BLAKE2B 593e3032d4d642b27be0e2cac1fa755e39639707747edd1472b53e9c845f85f6c65251aae06eff3969c68bcd2e51139e3c8ef810b9e6adb8631c4c61747070fc SHA512 bd68bc8ef58b5f1723f5ad272252fbf1edd11ee646a44a207c351f8d6fcbfc9d55a56dbaad42b3879e801ef7a3134a546c462a91f433ffe1be45b448c5930ec7
 EBUILD hydrogen-1.0.1.ebuild 2096 BLAKE2B 9372a442451a8aee63ab861496fa820e47396ee4ee2b0b9cbfc389ed8f7930c05efbb9e7cd61a9fd672f65c6dd207a98a6ff1ed237c7ceef79ff94bf5f060173 SHA512 e37238a1baf16a6f41ee930dd9c18a0d8d918c99eaba1a7f10deb311374c679355bea9dbee356381489b3e61cb894fd46f927e0aabdea865d628c57ef539a752
 EBUILD hydrogen-9999.ebuild 2133 BLAKE2B 129548ab21f33bd626ea3b7235ff61471142038109998683dff4aa98884b4fbab2b71c4088297f3ec06924d98eabad62852d58ad2fedb11b49e2a0cd76bd23ee SHA512 5ab310fa51b3a856441b5c332957838aa1725b7da740781dcf56c3a8ab8a08e6760b99a4b9c70ccfa35c741dd6a9bd1fb7e955d18771c4ff2d5fd8551cf32053
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch
deleted file mode 100644
index 4c6512760b87..000000000000
--- a/media-sound/hydrogen/files/hydrogen-1.0.0_rc1-gnuinstalldirs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 20368f1..b72a272 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -384,10 +384,10 @@ ELSE()
- 	INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
- ENDIF()
- IF(NOT MINGW AND NOT APPLE)
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
- 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "org.hydrogenmusic.Hydrogen.svg")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
- ENDIF()
- 
- #
diff --git a/media-sound/hydrogen/hydrogen-1.0.0.ebuild b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
index 624df7253667..e2d0ee7185f4 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
@@ -11,11 +11,11 @@ HOMEPAGE="http://www.hydrogen-music.org/"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-	KEYWORDS="x86"
+	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"
-	KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 	S="${WORKDIR}"/${PN}-${MY_PV}
 fi
 
diff --git a/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild b/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild
deleted file mode 100644
index dd0f1fcfd435..000000000000
--- a/media-sound/hydrogen/hydrogen-1.0.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Advanced drum machine"
-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"
-	KEYWORDS="amd64 ppc ppc64 x86"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-fi
-
-LICENSE="GPL-2 ZLIB"
-SLOT="0"
-IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
-
-REQUIRED_USE="lash? ( alsa )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-CDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/libsndfile-1.0.18
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lash? ( media-sound/lash )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="
-	${CDEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_CPPUNIT=OFF
-		-DWANT_DEBUG=OFF
-		-DWANT_JACK=$(usex jack)
-		-DWANT_JACKSESSION=$(usex jack)
-		-DWANT_LADSPA=$(usex ladspa)
-		-DWANT_LASH=$(usex lash)
-		-DWANT_LIBARCHIVE=$(usex archive)
-		-DWANT_LRDF=$(usex ladspa)
-		-DWANT_OSC=$(usex osc)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PORTAUDIO=$(usex portaudio)
-		-DWANT_PORTMIDI=$(usex portmidi)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_RUBBERBAND=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	cmake_src_install
-}
diff --git a/media-sound/jack-keyboard/Manifest b/media-sound/jack-keyboard/Manifest
index d844c687611d..491b58771d1d 100644
--- a/media-sound/jack-keyboard/Manifest
+++ b/media-sound/jack-keyboard/Manifest
@@ -1,6 +1,4 @@
 AUX jack-keyboard-2.7.2-man.patch 507 BLAKE2B d19f4357d110e62214940460f01c31ec10b843ac58082eb5b2daf7125e9d324e5e4f673b256f877cc3ba947b8e010ac497aeb0afce858c09bada37221fb887de SHA512 729e90c712cc52913920aaaea6d1364be96fe39e386efde1264a70fe502b171b777ac23127a40f4837cbf173442af56376a67413555db0631ad23effc811b062
-DIST jack-keyboard-2.5.tar.gz 108710 BLAKE2B 563857c4b4acee8df16b720530c444fc25745734e5aaad535cb4d0d2fda3d3a526fa7523b4a0bf8da0d93fad27312fbc253e3f509b744953cd386b0a2442852a SHA512 2a8b45315f25080529dc667d869ae6bd6fe70345f74a10625e6ed6a13043333e495f37c53dc49d968533c65dfb0bd0f0a6b91eaa89e890ce492cb1f3da8c8009
 DIST jack-keyboard-2.7.2.tar.gz 46164 BLAKE2B 05e4df0298a709b5018309f7c55553da5c5246264669df12c98158a9763ded492151422c79ce47d8b107b2858a9a6135c941cd92956206209fc07ef6fbb89f1c SHA512 d47ab73c3e030a1364703ab0bf9f88865ead5a7ad9b85e88268a57fab30677ca1e731279761b453b8d8f03ec4177da8e550f51e40119e2cfd921fec6f1927534
-EBUILD jack-keyboard-2.5.ebuild 608 BLAKE2B acde4d5b613a26b43abddf082a074eb7433f8ec99464c2a93e362a18e237be8292da599c9e045c08b5fd534d47cfdc364f58240d86c598570004c3d83bd386c4 SHA512 65a437235032e7adecad4084155bca77acd15cf519172af5671c1314262c6b513370256e58f6d7dc32d29185d4440938c2b3faac69131fdb12c317f38088da95
-EBUILD jack-keyboard-2.7.2-r1.ebuild 799 BLAKE2B da7b12d9a3aedd31dbcf5b475fa6c3dc3f4a1211d87d74c91652ccc9d8ff13a43543dc8d9fa0a808a81cbb6874375d2dcbf532b729bb1d7a6a94f521a02113b2 SHA512 a210b3200b1411f4867f7e70cf94031645478a41a08a75685179d46890897f4fc020f93eb0a50c2938c5ee72a429098a5ffb2eb07d74ccb7070dd39a43dd188e
+EBUILD jack-keyboard-2.7.2-r1.ebuild 797 BLAKE2B 70a25736c16fca201e2e2bf27924f25416a853453d4692dc1ad37d17d58472c6336635dd3199a21fa92ecdb3a442c943e8e2e9c2dc808d9e578fb5f4692adffc SHA512 e6533faf7fde5b0ab9881709946c60fd5b3099eddaf00a1ac976133c211fe2570369ee0cd62700276142d850513e14e1eee5e7c96032f257a7426da48ea73af4
 MISC metadata.xml 669 BLAKE2B 340b194e38aa8c5f7944961c33d675db41db1a681dfa623acc8e1da41d6eb464607a3a9e8ac9006d936e795fa08c1074289339828b29d51b35b11d78c73cf808 SHA512 70b905896625bcebe0e83a807e84a47688691e02b36e99a8d45b91be944709016a98bb5df97f591ea562d65daf79d7a33de26e9760891191abf8def0d245a9b8
diff --git a/media-sound/jack-keyboard/jack-keyboard-2.5.ebuild b/media-sound/jack-keyboard/jack-keyboard-2.5.ebuild
deleted file mode 100644
index 3168e84937f2..000000000000
--- a/media-sound/jack-keyboard/jack-keyboard-2.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A virtual MIDI keyboard for JACK MIDI"
-HOMEPAGE="http://pin.if.uz.zgora.pl/~trasz/jack-keyboard/"
-SRC_URI="http://pin.if.uz.zgora.pl/~trasz/jack-keyboard/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="lash X"
-
-RDEPEND="virtual/jack
-	>=x11-libs/gtk+-2.12:2
-	>=dev-libs/glib-2.2:2
-	lash? ( media-sound/lash )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-apps/sed"
-
-src_configure() {
-	econf $(use_with X x11) \
-		$(use_with lash)
-}
diff --git a/media-sound/jack-keyboard/jack-keyboard-2.7.2-r1.ebuild b/media-sound/jack-keyboard/jack-keyboard-2.7.2-r1.ebuild
index dd40aa9f0a7f..804da88c2323 100644
--- a/media-sound/jack-keyboard/jack-keyboard-2.7.2-r1.ebuild
+++ b/media-sound/jack-keyboard/jack-keyboard-2.7.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="lash X"
 
 CDEPEND="
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index 4edd9e8577ea..9a1f009d21a4 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -4,6 +4,5 @@ AUX lash-0.5.4-strcmp.patch 252 BLAKE2B f2b002772df6dab5c2942039d36e681697894cc5
 AUX lash-0.5.4-swig_version_comparison.patch 1225 BLAKE2B 92f9fe4ae053dc454f8434b823740c1cdd1bddd3c7a52ed505bc1acea64ddc145e1e7f9ffe7da31b7fd500f296b26c64d07c2a59149c49d18e0e4e0dc4e9e1a2 SHA512 39c3d82372592d6864a2c1e0de94ee150a434e107357ab549cf406cd58b7eb2f79cded6e97775f50e2e602906315aaf167869a53adb1b143eb3b5bb7147705bc
 AUX lash-0.5.4-underlinking.patch 660 BLAKE2B 6f3ca7580a588493610869ae8f2ff58f1c53b8e593e45c8613b1a15e7b97521f01372b493d3f627d878a8f0f6a349460da6fcc1eb48cb2b7e18e283acdc3a81b SHA512 118bccb0da55f0e7808424696143b00784afb18cdf982fdef837bdafa1dea6b55ed912762a964e210c2f0ba4a3bd1469249cad957428cca87da6bd0514751d66
 DIST lash-0.5.4.tar.gz 623469 BLAKE2B 463931a9fcacf806631746c69ccb2e2b795b8983e796835abce6036ed98571c41253fb8236a33c0a8bd1b5d3a910229d4e95f99257c1d82c64495201c64c6414 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c
-EBUILD lash-0.5.4-r3.ebuild 2603 BLAKE2B fa39a5ae0e3cfaf3714956644a4b924d298c703bbb80f7b0e66bef1ecdc11bb71ba96138d4f14fd80ab4a6d54ac6ad9cb41ed2be81dcadd9a65e3efa39b35f0e SHA512 3bff50bcb0cb252bf992349795f8876e8c158e116426109a089312da0634704129d10ec51c456eeb3beae7834efd465b363a93c146eeee3d9aa659a5f5a791e3
-EBUILD lash-0.5.4-r4.ebuild 2604 BLAKE2B 8aa4ce537296456b08fe70eb1909a6552bea4f08aea2a790557f03e08fe24fcdb85e7ff41d2e5e830f5db8f115b7a6587efd3753bc6bf456e3109e9b678adac5 SHA512 a70e90c3f14edb454bc1f2e5befb1bb20a323a2846985df5677e8a952321ed26288d43dc7e389f66485c5895ef4be05eaead5c72c6bf2f07ed204a43f8e3db4a
+EBUILD lash-0.5.4-r4.ebuild 2601 BLAKE2B b4be88f579f6d7e081dd752a41ff4d0225276a78482164bd654f983107a597d7ff491b77e6cfd7bc05541b3f41319df288df628c284fbc69f4eef7503945cc17 SHA512 465759a5527aac1227ce4623165fe76707d0b0883b957a2d3817091cd22b022e072c15f0b63e75c36a7b623cd54e25ef7440c1e142bfe94fd9d422079d07bea8
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/lash/lash-0.5.4-r3.ebuild b/media-sound/lash/lash-0.5.4-r3.ebuild
deleted file mode 100644
index b424f12e6101..000000000000
--- a/media-sound/lash/lash-0.5.4-r3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils ltprune multilib-minimal python-single-r1
-
-DESCRIPTION="LASH Audio Session Handler"
-HOMEPAGE="http://www.nongnu.org/lash/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
-IUSE="alsa debug gtk python static-libs" # doc
-
-RDEPEND="dev-libs/libxml2
-	virtual/jack
-	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-	alsa? ( media-libs/alsa-lib )
-	gtk? ( x11-libs/gtk+:2 )
-	python? ( ${PYTHON_DEPS} )
-	|| ( sys-libs/readline dev-libs/libedit )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-1.3.40 )"
-# doc? ( >=app-text/texi2html-5 )
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/texi2html/s:-number:&-sections:' \
-		docs/Makefile.am || die #422045
-
-	epatch \
-		"${FILESDIR}"/${P}-glibc2.8.patch \
-		"${FILESDIR}"/${P}-swig_version_comparison.patch \
-		"${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-underlinking.patch \
-		"${FILESDIR}"/${P}-strcmp.patch
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-multilib_src_configure() {
-	# 'no' could be '$(usex doc)' but we use the pregenerated lash-manual.html
-	export ac_cv_prog_lash_texi2html=no #422045
-
-	# --enable-pylash would disable it
-	local myconf=()
-	if ! multilib_is_native_abi || ! use python; then
-		myconf+=( --disable-pylash )
-	fi
-
-	if ! multilib_is_native_abi; then
-		# disable remaining configure checks
-		myconf+=(
-			JACK_CFLAGS=' '
-			JACK_LIBS=' '
-			XML2_CFLAGS=' '
-			XML2_LIBS=' '
-
-			vl_cv_lib_readline=no
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable alsa alsa-midi) \
-		$(multilib_native_use_enable gtk gtk2) \
-		$(multilib_native_use_enable debug) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -C liblash
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		# headers
-		emake -C lash DESTDIR="${D}" install
-		# library
-		emake -C liblash DESTDIR="${D}" install
-		# pkg-config
-		emake DESTDIR="${D}" install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	dohtml docs/lash-manual-html-*/lash-manual.html
-	prune_libtool_files --all # --all for _lash.la in python directory
-	use python && python_optimize
-}
diff --git a/media-sound/lash/lash-0.5.4-r4.ebuild b/media-sound/lash/lash-0.5.4-r4.ebuild
index 74b77f7bd7e0..95da6954e5d9 100644
--- a/media-sound/lash/lash-0.5.4-r4.ebuild
+++ b/media-sound/lash/lash-0.5.4-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE="alsa debug gtk python static-libs" # doc
 
 BDEPEND="
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index a36d3e5c6b7f..bc196ef89ef0 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -3,7 +3,9 @@ AUX lilypond-2.21.1-fix-font-size.patch 505 BLAKE2B 33f98803eea6a87082a9c724bb88
 AUX lilypond-fix-cve-2020-17353.patch 2867 BLAKE2B 135d6ccc6ed93786189b54ea77219d527e6febd59434a10b33255e2d3c21db600ea9e231d852d188a8933c6acf5f1567f48c4b7e8f905f8bc87dda1b13d8d936 SHA512 83f513a6c4999579102b592e7babc556f49a4d04f799203ff790ec211c0744a91a17700b6742c3a2044ef90c2ce52a6f768f69f376952867715315bc8096689c
 DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860
 DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958
+DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7
 EBUILD lilypond-2.21.4-r1.ebuild 3053 BLAKE2B f8f2f771482766d84725f1237f65a3fd7d9f83043a9458ef0f9484609fb27e0a83586956a091cfa75b31a4c567cacf60cea51a6e8052c49d2428dd08abf0f997 SHA512 0a089d91141293c8c85f839c00b7524afb1fb4cc06a78eea49faa16d3c678c904fd393eaf1aa007015f029eaed18cc71fd4ddbf34ae78436c3c8e6c6670eee3a
 EBUILD lilypond-2.21.5.ebuild 3343 BLAKE2B 77b92a732c68cefb1c1cdff69ed0e54b20b633d6b5ee1a292d543a45385bafe67594381d9b0ebbfa4a42f92cdc56509f0a0295c0c983b28bab027c525a3f93bd SHA512 6f6cb65f7e1a951ea2a1039bece43658471ff32cdfa5159649b87fd83681b3923ca2c05254417c2d54a9608afbecf004c50738be90f7e29ef6091d4b07dc208b
-EBUILD lilypond-9999.ebuild 3343 BLAKE2B 77b92a732c68cefb1c1cdff69ed0e54b20b633d6b5ee1a292d543a45385bafe67594381d9b0ebbfa4a42f92cdc56509f0a0295c0c983b28bab027c525a3f93bd SHA512 6f6cb65f7e1a951ea2a1039bece43658471ff32cdfa5159649b87fd83681b3923ca2c05254417c2d54a9608afbecf004c50738be90f7e29ef6091d4b07dc208b
+EBUILD lilypond-2.21.6.ebuild 3264 BLAKE2B 733deba469734f1a9b5446258c87a35a9cdc05b887e7ff97772608780614d7b317e10a1781d3907f983cc8ba36ee74069eafb2fe3db1e96acd5cc77ba70059c8 SHA512 5437df0f0642ca4375fd2c03f358c782be2cce1a5867dbec647cea56a69753f488b9a094d39f84e3093048a48f98e8b44a693fb1e4415313f0c25c8bc68c9eb0
+EBUILD lilypond-9999.ebuild 3264 BLAKE2B 733deba469734f1a9b5446258c87a35a9cdc05b887e7ff97772608780614d7b317e10a1781d3907f983cc8ba36ee74069eafb2fe3db1e96acd5cc77ba70059c8 SHA512 5437df0f0642ca4375fd2c03f358c782be2cce1a5867dbec647cea56a69753f488b9a094d39f84e3093048a48f98e8b44a693fb1e4415313f0c25c8bc68c9eb0
 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
new file mode 100644
index 000000000000..89cf464d7f84
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.21.6.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,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-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index c03d4b781515..89cf464d7f84 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -26,23 +26,23 @@ unset LANG_USE
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
-	>=dev-texlive/texlive-metapost-2020
-	>=sys-apps/texinfo-4.11
-	>=sys-devel/bison-2.0
+	dev-texlive/texlive-metapost
+	sys-apps/texinfo
+	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
 	doc? ( app-text/texi2html )
 "
-RDEPEND=">=app-text/ghostscript-gpl-8.15
-	>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
+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-1.12.3
+	x11-libs/pango
 	emacs? ( >=app-editors/emacs-23.1:* )
 	guile2? ( >=dev-scheme/guile-2.2:12 )
 	!guile2? (
-		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
+		dev-scheme/guile:12=[deprecated,regex]
 		<dev-scheme/guile-2.0:12
 	)
 	${PYTHON_DEPS}"
@@ -66,7 +66,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
 )
 
-DOCS=( DEDICATION HACKING Documentation/out/topdocs/README.txt ROADMAP )
+DOCS=( DEDICATION HACKING README.md ROADMAP )
 
 src_prepare() {
 	default
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index e815e684874b..de720277869d 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -5,5 +5,5 @@ AUX milkytracker-1.02.00-clang.patch 2346 BLAKE2B 4e957fbc69e4b5aa9ee5f93292df62
 AUX milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch 2570 BLAKE2B fe0a454e34c9b7b88125ccdfb6f77e1cc014013a8f054f00c6330e733ba54154bc1d96ef256cf5befc8329c169e57f29062652f0ff84dc55201572d0201111fc SHA512 0112a805d61204ff31ad0b1b31cbc9ff60f91f5ada275a839f0c258c3f5302239fd9b00ba7d8387b5865ad2ea86abedc32630ff2f1b58c0a74bfa67895a5676a
 DIST milkytracker-1.02.00-cmake.patch 40073 BLAKE2B cef8fc7efff9324c1d628026d650c79e11950b53481686e5dd35ace483839fbdd6b2b1f8ccce2f688beec2c7c28b0fe3b60d0e8d540d6cd163927f4bacf9d396 SHA512 bd4ca0d092229722ca81addaf9eec3ff1b176061da7b44fe3f02fbe020c3820778ed973dde95588b4c9f918728e2c69c24ac23083a2f48c0cbad2e854eeff5ba
 DIST milkytracker-1.02.00.tar.gz 3753882 BLAKE2B e9bb4341e016d2a9c518835e8b4620f748da60bca7205302e7500f14f3294e7fa9a20fef203226fffbe22a11a3b4978ea928f0f544eb70e99b5998ecc7c45611 SHA512 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134
-EBUILD milkytracker-1.02.00-r1.ebuild 1529 BLAKE2B e54c9fa967fc74dc2c8469d48d5df7f044744cb3eacca21422165946838e1ee83fe05352390259c5dcaf63d6c35f8055c286cdfffb0151b8d59f17d8d118c56c SHA512 5008cf27c9c897d6a938af45283c08c7bcef875490ba5131828c69eb5393f3d60bbd23ff756ce78604e2ea26a1011206ce774c22393eac5229e2f4e9b2e34bd1
+EBUILD milkytracker-1.02.00-r1.ebuild 1527 BLAKE2B ad59c3aec2f8c6875131d84463a76a586af11f2222a073728ec26f7117362d1e0f8447b7b41d5fb56cf9f03816f1e10e9ad0430a26529ef0c0cdeabd67f83557 SHA512 cf999b71b395b7d42575f374ac4e5b21d3e18db0c749cba2811d63c16a926e3c1103bbcc96c46faa3c91bc18bb056fafd66ed96a2a774b39facac3bc80828c23
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
index b86251123c51..ca410696e6b8 100644
--- a/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/milkytracker/MilkyTracker/archive/v${PV}.tar.gz -> $
 
 LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa jack"
 
 RDEPEND="
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 27208dec03df..1eac839a4ede 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -2,6 +2,6 @@ AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e3
 AUX mixxx-2.2.3-qt-5.14.patch 17550 BLAKE2B 3f5c16106bbda8e45f1180ef6f2323a3786ddb11f9a355fac57c545d71a1f5080ef39665011d41b4500643a4e33340851bb3d849d381874e4abf9ac42a18e85f SHA512 677d8e832aab28f21c2641b1a94fce6fa43d652ba76b580a8a7cb7911dc5e5fb788cdcf7825906e7894d90198433f96e421531af4e65bd7d16a8b16fcb68fb54
 AUX mixxx-2.2.4-metadata.patch 848 BLAKE2B c5acec33886b585572426da7dd56c147c64683ab5f30b5f8023836330b365bbd17cd490cc70ae383c2159b18fcf9b582f6020b04df20dc18c49c0489c59c6f90 SHA512 d09fbb8171e84b0a0fb23249efb9485140e080e3abaa06c4c59ce1b1110d84f6d6e8c421207ffb214738ddf3e23739db04257bef212728631f9a740693b5c8f8
 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
-EBUILD mixxx-2.2.4.ebuild 3188 BLAKE2B 59e459ec2bcfb09bfade6a0ec095f7b581b18282065e41ebff8f95846365d65f0ff60bc8da41c0cd9f378b23f1f1c3b369be0ad2e701138b89c768333d8ffc21 SHA512 97935365e69d8b78ab9c7d9bdb583ab53411b2c61f57bb6fe39ee2985603dd38cfdaa988051a92a4958521a6a8039f51b953ef50319c95f44435a20eb7b23ed4
-EBUILD mixxx-9999.ebuild 3091 BLAKE2B 7f20e035c9936eebf1d48becc5f941dd85cc06ed903a7a0182dd0e767598e39137043c9da2068e09fcfc900b92ef57fcc7476eff3aebb8e2ba0d46fdc98e71ff SHA512 3865bf5ccbba5f712ca1e91958dda74438f1dd70b77079293429a43876dc658a7f25007aadf2a87333053f494f8e26f4b398293c168e6dd8f61faf67ae29882b
+EBUILD mixxx-2.2.4.ebuild 3178 BLAKE2B 1e3c0021ae0f7f22cdaa690d3995638d863b2289c8366b49fcb5d80876898d10474983ad359d84802441008c106387bfc5b1343260a0ed2f464e46bb4299ddd1 SHA512 709ea52ec18f6aeb35c4abbe19ef7df24a6ed6e95218090048ffd5a9ad29e3bfc9d6741db7cd69733adb72a1b53789bbefb767a15f3469141797071e14a1192e
+EBUILD mixxx-9999.ebuild 3081 BLAKE2B bc18db6124d898a6517b822ec959832d3782b605c2bdfd11fc48c7c6aa4fc44c2a4103657b9deeedfd04a54179846ee969e66efa77ba2a1ace7ed6619d2052f2 SHA512 3bd11e7eae8a549583c1aed47da56a6cf80f002afcd2dd4cd39b09242d110ca665fc32298309c021636018b46bf276924285ab8342477388da2f09e917eba606
 MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f
diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild b/media-sound/mixxx/mixxx-2.2.4.ebuild
index 931b5e47cce9..d26bd4e971fd 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+PYTHON_COMPAT=( python3_{6,7,8})
 
 inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
 
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 7656de621cec..8b6b845279eb 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+PYTHON_COMPAT=( python3_{6,7,8})
 
 inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
 
diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest
index 3a504c0a37fb..14961adf19fb 100644
--- a/media-sound/potamus/Manifest
+++ b/media-sound/potamus/Manifest
@@ -1,3 +1,3 @@
 DIST potamus-17.tar.gz 146822 BLAKE2B 9fa7beabcd4e0ce8a3a6adda4fa425d0a6789c85cc1852bcf528c709574097f5fc34127cb8404d2d8b01c0f961026439786f58a0afd3bd022ed9efe22790bcf9 SHA512 655ac7c99e252c200bb012b1076850ae8c4307ac57dd8d6cb86fc0da0a0ea3b3193c617a365889485a4cab87cb113e40f1d828585e5bdf20c5f2b1b0a2c51099
-EBUILD potamus-17.ebuild 1135 BLAKE2B b599d5bc1103afa726dcd2d83f4be4beb70d4c5a976f077980e3b51cbf9258b3a2242ed67f87a5f5127f42d9cd0a1b866c10396b1ad81f5d7fd0627021264959 SHA512 9e92cdfce334ea08f77c3216cc2d994358f88371cca90b89d5da82ac2d1fac6d6ccfcf375d6ceba6aed482fdbc5a85c45c30d70aefa6364e2bce611046f6a586
+EBUILD potamus-17.ebuild 1133 BLAKE2B a5c02e6418299c784836bc3bd5813e6836853c75ba262c1584eee0d6d90d54fc69ae3ee6835460197c49343df7e612eee767ba52c76036cdddcf01a95580ca3d SHA512 f34d8c7a53acf48e2aa84fedf70608e62730579eaeb6a376b5ebe3d030366b759aff340cd8329608b3fc55cd28d75d79be1fd0e95d96c3b3e9833a104e634cd6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/potamus/potamus-17.ebuild b/media-sound/potamus/potamus-17.ebuild
index 20cdf12c8897..1579d146b648 100644
--- a/media-sound/potamus/potamus-17.ebuild
+++ b/media-sound/potamus/potamus-17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://offog.org/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+ao audiofile flac jack mad modplug opus vorbis"
 
 BDEPEND="
diff --git a/media-sound/pulseaudio-ctl/Manifest b/media-sound/pulseaudio-ctl/Manifest
index 9947faab79e3..4d9d32ec4ce5 100644
--- a/media-sound/pulseaudio-ctl/Manifest
+++ b/media-sound/pulseaudio-ctl/Manifest
@@ -1,5 +1,3 @@
-DIST pulseaudio-ctl-1.66.tar.gz 6633 BLAKE2B ec197571563f8503a0b35a4a3269984e8f53ae0df9a2bcc6a8dcf9a88df8d927634a5c8570a4bb69cc0d36289adfe73ac5b7f2d904790476be83fad3b93e2b05 SHA512 cadcb09781cf370e5280c1fa20bc9d10cc8e8162859a53f0b3cf3d94a50267638f9a454716c07cb4d300de9a3cb1bf6e6950763c2d97a48ba6cb5ac8ec72e8f7
 DIST pulseaudio-ctl-1.67.tar.gz 6615 BLAKE2B fd760fc5475cdd9c6bbced9f4bbe0f62e793364d375f0bc24686986d42c9ddcfeddde501950c3572a4bf004cdfba36d3dc5aa1df3eed7a9730a437e74eb97b26 SHA512 5ea1cbfd87cf073de46b6fd9953a3c7b9c6969da46103dd5dfc56aa3f179b2ba36ade5db7ca47d204f0f60ac02020f1a4f2dd58bbaf010f9a99780702295418c
-EBUILD pulseaudio-ctl-1.66.ebuild 683 BLAKE2B 3b29bd3f83c06a94fcee3432bd31960d45bbdfa09e8947bf71ab0e5e4836667ef0a0dea8d897176fe0dd04d537f26e2c1dc893cfa053bd23bccec2350949cdcc SHA512 63d4e67f2acac1baf8eb2f94377cc09b3715e54459cf035444552da5c52f3c171c632110c653295b103205e672c9729ac2ce05f96baaab524925342b5f3edabe
 EBUILD pulseaudio-ctl-1.67.ebuild 688 BLAKE2B 3a49094e376b4b94d8dc000bb482c7e1f05dcf27efde4a79ad3b98cd1cc0b908dab4a9a4008f19371b8ba5834de35bfc7813cb8c60240c2983011d77332add43 SHA512 1dddd8e10477b99d15c64cff2f05401c36c6f09ecbae7216b44b1a8c8abbe977c00bd9c304d51f6521dce8a70ff87c624d6f539f9c1c1de78175b64f97b10295
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.66.ebuild b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.66.ebuild
deleted file mode 100644
index 56d2816a5cb6..000000000000
--- a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.66.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="CLI utility to control PulseAudio volume"
-HOMEPAGE="https://github.com/graysky2/pulseaudio-ctl"
-SRC_URI="https://github.com/graysky2/pulseaudio-ctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Optional runtime deps: dbus-send for KDE OSD, notify-send for libnotify
-# in both cases they should be already present if DE supports them
-RDEPEND="media-sound/pulseaudio"
-
-src_install() {
-	# install-man target compresses manpage
-	emake install-bin PREFIX="${EPREFIX}/usr" DESTDIR="${D}"
-	doman doc/pulseaudio-ctl.1
-}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 8cfd280bacec..6a29a27de919 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -2,8 +2,10 @@ 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.7.3.tar.gz 2010399 BLAKE2B a77a24fe9f8708564b146d65eb10a0021a05f102bacd25ac137ce6a2d21017c4b5c68a57c5cb2345cc228280460f1163d5dbce038d3bd427829335c8aa78d9f4 SHA512 0170ae0fbc3f72120545657ad7013f81afb40a96224c690c41206b91ae7ac2637f17b19238ef7d8a9f21a361cb9e76a0e2bf83e84d1404cc69733e7ad156c3f4
 DIST pulseeffects-4.8.0.tar.gz 2003382 BLAKE2B 4ec1089d0d3051a9697c08adf8305ce9c0ef794d6cffe25a36ffdc174d5b63ac94dee09cca0970948c25fa948c8ec521bc750a2b2e08f7f204889eceb65c0de9 SHA512 1fa32f34d2e1aa9fc87eaaecc73a5aad017f2bfd26228edb0cba938e2ab0146e8882fef4b8d74364030d7a78467e728f4e517870be422619d87be2c964b55492
+DIST pulseeffects-4.8.2.tar.gz 2000571 BLAKE2B 70627741b41ca28489ab2e7813936d7b37fa521d3c9a81fa651ee5999d9b162e924db11fb780db7a9fe2b032b4d8596166336e59f754ffd1746f57b0ad41a34c SHA512 14fc30486568fd6729280bf1197b2e2292ddba188d984559c0ffe7faff1a9550e58e776d6d5aade12a6057aa608a58e0eb60830fdcb18d783c22d5f971e6d616
 EBUILD pulseeffects-4.7.2-r1.ebuild 1903 BLAKE2B 50882416becc1e4545bcef6dcf5a245465064aa11b876ff4191d79bcd8e0723fc01d05b76f5d4fb6930f2a330edb4644d4a0b63ad1083c589e7e93c400494a3d SHA512 1726d0a7c5135c9423c4d85613d4b3b90854452e25a51ca2ada570d9c502d923eb4ddf89c481dccb4ba12f4583f5b42d74efc7b0e59833fc104452d468c003bd
 EBUILD pulseeffects-4.7.3.ebuild 1853 BLAKE2B 39c86df9a5b0d56ed0ecf183bf47a7bc28ba4a7f89233249483ea9d49de0b3ff9982f33732b030f810317955f7fcc4fdbec53e8d0675abb42b293d0ddef956f5 SHA512 22100898b102036d3e8359430cac32b6256e97dfdb0284a144c5b89fe7415871da96d349da8724d8be7b70f107c3a6570b2070db242a806b177ece2ec2d00e6b
 EBUILD pulseeffects-4.8.0.ebuild 1810 BLAKE2B 9f47206073da304a1d4d057da553541969189103c3eec02203b99ea419cae15cf1e497381eb550269903a51ee8bd3387d3efb6585278f66bed09f981720a53b5 SHA512 8984fdc86db5e6428c0fc3c37fa87708cd9d69d0ee29b83e34c0b0d697ba2f5b36fc9c6669b2c08e9e90105639c0fcf1c65a4b43a7be8dc2661f6a998e5e53e3
+EBUILD pulseeffects-4.8.2.ebuild 1810 BLAKE2B 9f47206073da304a1d4d057da553541969189103c3eec02203b99ea419cae15cf1e497381eb550269903a51ee8bd3387d3efb6585278f66bed09f981720a53b5 SHA512 8984fdc86db5e6428c0fc3c37fa87708cd9d69d0ee29b83e34c0b0d697ba2f5b36fc9c6669b2c08e9e90105639c0fcf1c65a4b43a7be8dc2661f6a998e5e53e3
 EBUILD pulseeffects-9999.ebuild 1810 BLAKE2B 9f47206073da304a1d4d057da553541969189103c3eec02203b99ea419cae15cf1e497381eb550269903a51ee8bd3387d3efb6585278f66bed09f981720a53b5 SHA512 8984fdc86db5e6428c0fc3c37fa87708cd9d69d0ee29b83e34c0b0d697ba2f5b36fc9c6669b2c08e9e90105639c0fcf1c65a4b43a7be8dc2661f6a998e5e53e3
 MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.2.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.2.ebuild
new file mode 100644
index 000000000000..cbfd497f5e76
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.8.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
+else
+	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+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/gtkmm-3.24:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-sound/pulseaudio
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+BDEPEND="
+	>=sys-devel/gcc-7.3.0
+	dev-util/itstool
+	media-libs/libsamplerate
+	virtual/pkgconfig
+"
+
+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/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index e3efecf9a869..e31d2405e6ff 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -2,5 +2,5 @@ DIST qjackctl-0.6.2.tar.gz 1027742 BLAKE2B d2db9e0496223844e3cb289aa8c4ae136011a
 DIST qjackctl-0.6.3.tar.gz 1033664 BLAKE2B 98d80d0fea3db359b732fad14711352ba688e605b7225daad64d7df1dabf1d19e24b4d643581f1936afa0df0c84350cf5727686246bd8a850e09da969a228e44 SHA512 72a9218b3b8a6b72470656e774f5cfbfe6670059e9f1a85a394345f4689c5d5c05af23b5e37d5f8dfc6159e591f64249006936069dde1632ef9d74b6f8355e0b
 EBUILD qjackctl-0.6.2.ebuild 1227 BLAKE2B d620ddcc5f4e2fe0b691dbcc1bc22d1882597de0481366dfa2909be7b759d6ba1b301a8a75e839a5cdf6d7c9abd8e15222ca425b9593c5753e56d1475bab7711 SHA512 e06251755f474ad4e06a91feebd3f514eba6de3072d85f5a6c23667f0cde7304d5879a9a7b9d29f335220bd723e5e9e5803aee965e2d3293083c89fa5d00b0af
 EBUILD qjackctl-0.6.3.ebuild 1139 BLAKE2B 99e675983c1880f44ef99ef024dfcf2d063f9ba7d98afeb7b8c13e138decc46ca4c5981c93cb4fe003a4c97a5c7f6bd238c60b2545924a52b693245896a1a781 SHA512 ca91cccec3dd6f42cbe784c8eecde0b92a6fe1989a836791747910d1ca23abaa4b65967c2498f18d100061172e79185c8bbac2f9f1e398a0a86904102f21f1ed
-EBUILD qjackctl-9999.ebuild 1190 BLAKE2B 2b78ad39d1ffc40cfaa4ee47e670bfd39c0af52919f591214b21edc6756011f531ce08aeba187a0cde72a3d04b3ad7d1f87754610e2579ec59950797daad1740 SHA512 8461a4b4777a31bdee87cb1d10c40e914fff708e9512570512cce03312be5e6b3c4517185d7c32e0b59ac1c12f1d4720a309960b53dc7eedcd8e3a5e27ce560a
+EBUILD qjackctl-9999.ebuild 1132 BLAKE2B e675b9c24d2b977e169778b9e42b22f916194c1e994c9d1ba1b6472ba4662f1043904f3130052b36dcf2ed6a16596cb7fe0f45e19044258409f1fed2fe58e201 SHA512 4e324f6923fdd1508b2c0515814191ccec6212234ae4994ffcdcb9beb6014e43985191c169b6441c88ff223dee53013483f2e1a3f841f1ec8eb497c6028bf680
 MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9
diff --git a/media-sound/qjackctl/qjackctl-9999.ebuild b/media-sound/qjackctl/qjackctl-9999.ebuild
index 61dd95c2c302..1601c3b1ea75 100644
--- a/media-sound/qjackctl/qjackctl-9999.ebuild
+++ b/media-sound/qjackctl/qjackctl-9999.ebuild
@@ -53,6 +53,5 @@ src_compile() {
 src_install() {
 	default
 
-	gunzip "${D}/usr/share/man/man1/qjackctl.fr.1.gz" || die
 	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
 }
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 95eb315e60b4..fbb2741b2b10 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -3,6 +3,6 @@ DIST qmmp-1.3.7.tar.bz2 1250192 BLAKE2B bb94234beefbe44606d8db8cc95bd712b4c766d4
 DIST qmmp-1.4.1.tar.bz2 1296224 BLAKE2B 4a4b72f30bbfb06d312d69c9c0d48fcaaed2d936453ab29c0bd5223819358d2894f4f016a8203c2ea15b7a193b811ae2892e700dec98e580393a9fbf5e0f767c SHA512 af971447383730328e33dc724b9d598a26404517d5aa6e8bb5a2d84bbeb1f628d363383bb5ddc571855d8416b084edd09f64174de7985788671e47317ec9f1bf
 EBUILD qmmp-1.3.2-r1.ebuild 4207 BLAKE2B 3da46dab28fbf9747f35cefae578dcc3b407abc2c5b032060e7eb8a401911ab5f4a798932e42e82fd2967e45ee4af90aa7d7d63b0455a468c2bca50a4dbffb7a SHA512 4d8eb5669edde5f39c4a0212f4bda8704606f3c995996c6660d97ca2711bd63af80e88c08e666d09b09853684ec26506b432d4242a09c38bb5c8d6e140abfb51
 EBUILD qmmp-1.3.7.ebuild 4181 BLAKE2B b3bec00895515fda32c1cafb6c261fcfc9408176e865f3629189e7bfbca5269661fab298466ce1185a41c54f29b5a1e2d9e69eed8378eee25e733d84405b6c1c SHA512 83b77d61fe775d1b4d4f475cb49a9c48eadd366a7e09b11fd8244afaecdf4b355afeed0dad9aedcbbd1472e790b212c6a1c2e2094bd171c10509485d795e68bc
-EBUILD qmmp-1.4.1.ebuild 4054 BLAKE2B 3e5e482247a44b4767ddcf967a5278efd2624bb708b0bf2381d1d945546e0264f991f4c3c7fb17cfd2f60334b7356366681716397ea117e9001beceaa35bb0e8 SHA512 b8bb54f3dd7a7b7c923ad47f42249b4597f86120d9746db01115ba7933466351f79bc6cf26dfe4d2a861924de2908d701cb8ad6ee0830a72078cd30804b1c427
+EBUILD qmmp-1.4.1.ebuild 4052 BLAKE2B e5ffcda6a84276bb0321c1a08de1e251520c4e85ec04a3a82611055ab765dd9f9352cb69f122df25774a36f72bb1adaf00ac945e3c610f3a5bdfa344370e241b SHA512 5926af39c102f98b0dfc979a402ede1e7089d3b9dc608fa64a3775aeb8a04058069f23d7ddaaf8589e764ca0070cac078adb8c8f7d2e0c8c0e9ea46f31ee7eda
 EBUILD qmmp-9999.ebuild 4054 BLAKE2B 3e5e482247a44b4767ddcf967a5278efd2624bb708b0bf2381d1d945546e0264f991f4c3c7fb17cfd2f60334b7356366681716397ea117e9001beceaa35bb0e8 SHA512 b8bb54f3dd7a7b7c923ad47f42249b4597f86120d9746db01115ba7933466351f79bc6cf26dfe4d2a861924de2908d701cb8ad6ee0830a72078cd30804b1c427
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.4.1.ebuild b/media-sound/qmmp/qmmp-1.4.1.ebuild
index 45e48d80e0dc..2b783689f09d 100644
--- a/media-sound/qmmp/qmmp-1.4.1.ebuild
+++ b/media-sound/qmmp/qmmp-1.4.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://qmmp.ylsoftware.com"
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
 		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 else
 	QMMP_DEV_BRANCH="1.3"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 5a2e7b4eba72..103220589abc 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,8 +1,9 @@
 AUX qsampler-0.5.3-Makefile.patch 466 BLAKE2B 17d8ac1e29f6668a02fc7734d51f40e9f5a161da799fdeb2ddc5eaa89a69c607de6183fab78a13f4bec5a0efc002081589ca141f3232f37cc0051218f440fd5b SHA512 6f02c41941bacce8b49837471f5699960b069bd48e99b116402afa5452116890fa26da340a2e85b036d2051906b5eb828832598925b1d314de2a866eec47f155
 AUX qsampler-0.6.3-Makefile.patch 515 BLAKE2B b12882524ac5e0500a6c07804ed8b50ae085ac14873b723ca4ec2a71797da76711c5516ca0f6866994a1172d3f19ae671009d270be4429850e8bff0893044123 SHA512 0d49e0d178e638cddd69677c064368b5e6dc214c173286c3f6f82b1c469a875559bb25538ed8433d4e842d98418d344dc349ac454239983006b7cd4f195b1751
+AUX qsampler-9999-Makefile.patch 701 BLAKE2B cc95a22d6e003d3b25993e2068e2101684a85da1b8ac47c35ae330dcebd9f72ab3cc2931f1ec840d484c3f1871c0991ab90d45e1744de9fabcec293a3e260f28 SHA512 7f582fa7103d77f79c14671551ffe9ce83ac4ac0a12ee76f5fd63a670d5838af6a2b7718b8de27946b8e1234081b7316fbc4837a94ceb28063797027f54cddb3
 DIST qsampler-0.5.6.tar.gz 260607 BLAKE2B 52002ad95fe11266337f058124e7ae33947eb50ce5b12574c9091c10827bff2a8135a52bd53dd030be0394fdb39c2bd034308ae9d615c0b74ad660a06573446b SHA512 2a3a322fec31d9c66d7d1e9b4a7f74629e4b2bcf3ee2350bca8d450d2f68c41ac80563f8e28bd5314f00f0387503aa1e33c0b94ff518cca27b2ca93d9d72334e
 DIST qsampler-0.6.3.tar.gz 284613 BLAKE2B a4ef67014578b4eb7b6f6e7b5da94b04253a40bed0cc413acfde62f4660d2e1d3485d301637d1871e7f20dcdac34ea81511738a4455f8690f40460d7ea4db72b SHA512 55fe16d5cfe0245cfedb228d448235997160471343191cf204347bb13c260be747a06fce2344b36a60c5877f89b32b0f4ac4861ed8a3d555d4cc798f21f5e1ae
 EBUILD qsampler-0.5.6.ebuild 1018 BLAKE2B 8a350360a4d6bc54ae75a3f2e895a4711cc50532f62cf3d260a38a25142ee7531b4641bbeb539e41b35864ad5d37834d7fda94f827eb8c3dbac3a34057cf6c36 SHA512 254e07e7188f7fa5a381e04826f2a5aa0c636c74fcbbcec66cd144b3575c1d813021309acc8843ddd31f62677054d5ecd71d915195ccd611c64cab9a8bf4a004
 EBUILD qsampler-0.6.3.ebuild 1000 BLAKE2B 7bb7b8ef05cec4637340b639dfd562e2d16c0fae437aa987c50caccc62e8544d6c8b8cd33b4b1a5318acb395cd37cd8aa9d51a7236793b9aefa8e51601dc4274 SHA512 efdd00dd01f36a78e72f251a10e97816af5a18daa41135c488e8731e9a8fa93f8358088c41597b4426d33d319f5581a4df2d8f6f9c75fbe54b5801adfd55a27e
-EBUILD qsampler-9999.ebuild 1079 BLAKE2B 7b68bb9196760efef7f8f8880356d0ec511d238333d192a9bdcb587fe90a6c9d019b52b52ea8fcbb5011fe1313d11f6bcfabdfe94bedac5a594ced17aa38a65d SHA512 30123798a8c6dc1adc28ac1d6f0e2bdd4e35375bc720e1bbf4641a8f5d565e1b42c29feae3f6d3f4f0eb1f224b2b4b7fbb879cf2f75442a7483f4f46438d1682
+EBUILD qsampler-9999.ebuild 1072 BLAKE2B 756a2fa86b6e39d464018c6873017f8c914c59b08a9d3ae702af01fd20549daf7e2249591045b1a3ce6cdf6f3acf24f4be567749ee943c09a6fafd6dcbd8a2bd SHA512 9a58651e257148e1d13979573d036047acea54a60566dc2e979d7008b34e11e11e756220f816af0e70ca20facddef6869c615a3f30a7ea66d79443a56a0011cf
 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
new file mode 100644
index 000000000000..29788b0fd35b
--- /dev/null
+++ b/media-sound/qsampler/files/qsampler-9999-Makefile.patch
@@ -0,0 +1,15 @@
+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-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index fbbbc262bb94..23f189c07e1c 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -32,7 +32,7 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
 
-PATCHES=( "${FILESDIR}"/${PN}-0.6.3-Makefile.patch )
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
 
 src_prepare() {
 	default
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 4d2dcd60ddee..318ebabdaa91 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,6 +1,7 @@
 AUX qtractor-0.9.13-dont-compress-manpages.patch 515 BLAKE2B edaa13a27776997913b9f2049d4c607dc622ae721ab03b3265b9e9c2729aac5796c43c8730d61cd1996a246a6752ab99041bbcccac0e3fa5879864c20499d43f SHA512 3a49c5e175e7b64ff0a2d1a791c59a38b44b0f7116d068fe2877e3fd1636259288becda9cb922150a8166ef7df116df6ec34783a750ff4aec3e276d681c05a0a
-DIST qtractor-0.9.15.tar.gz 1934680 BLAKE2B 347e66266d5b4456c1bafc5ff2120d4a17a5c0a6bb8ab8fe434a84f64b6fd02dc432c5b76bb4e547d7adb6a5959a3f964ceb443ae379b347d69c9d72dae414cf SHA512 11fa61dcdb8960ff86939ade2694d7cbeb623d9bd1bac2c0f27ff1d459b5685116ed8c59037f67d07def59f38c8c8c0a5e8678a2b5f1d002eb10c09b020d044d
+AUX qtractor-0.9.17-dont-compress-manpages.patch 701 BLAKE2B 2d36699ef29e21dc80bb51b4530bb06f039b35006106e5f88bae29e1a813529cc70d861cef134e680036964c034c9f8c9f2b9bf11e115df5c213489e27890de5 SHA512 95d1c8135ceb2afa1b92410ec26a0b6586bd5bb419e4d91f83944d39fa3a877519e60e8c0bda9e4365fa358e9e2fecbd80a61bddded22a745265bc6ada95bbc5
 DIST qtractor-0.9.16.tar.gz 1937425 BLAKE2B b49c2455338bf14c918b9a00567855d68e0bc954ce1e7d4df53cb8330a44e65d51e6ea21571d0cc22900182a39efa099194d2cc676c9f353eb76ee69a62d48ab SHA512 7312b73bccf79e1ca2cadb0bf33b492b221a65fec9894225e78512d63a9ac65b8387edb854607c44cc8a7ecd72758437c5c67ef901e58e495b09c0f48bbda01a
-EBUILD qtractor-0.9.15.ebuild 1553 BLAKE2B 4535de76cc27d77876c0bd9b0156eb5ed9861873a2950fddbe8ccbfc258bd6d61874661f7c37b2930e6a5be68e56bb4d6f77d6eecb486355d0898de722f22ca5 SHA512 803fd64d73659c1e24e9cfbd566a881d676a4f7dab93291c1e4b94037e3243181d3f2e64d2dfcf664dea939df26081e338ce7878890c595b54a0a0ff27ca0224
-EBUILD qtractor-0.9.16.ebuild 1555 BLAKE2B b179551cf5445d870b138029fd71c772270da6e89c44b22010ad083a6fc49396a8870b2407c317d58c4b8f6cab4152be698c28ac878fc67343b788225da62483 SHA512 ffbbdc88c99b5ce48e0bfba3e2a00f8077cd11aafa8c01594ebeb4c3272d1d6192671aaaa3a8a200a0b180e13059c0dc22c0b6d62406510a53135c090a29bd9a
+DIST qtractor-0.9.17.tar.gz 1934317 BLAKE2B 2cb387484203fcd6511a87364db9ed00d4d21452948abc0bad7d2775f022ab9a224537a8300a46ec220ddc497d071072456ed4e46a3e73c52954b5992bb1ba52 SHA512 9392eb594920be5c826613bfd75be93ac006a718c14256b20bf8d6af23f9316f56c801e5422548b9387ccfd4fe3ba926f1a01cacc2324eab1ca66255f02c9c93
+EBUILD qtractor-0.9.16.ebuild 1553 BLAKE2B 4535de76cc27d77876c0bd9b0156eb5ed9861873a2950fddbe8ccbfc258bd6d61874661f7c37b2930e6a5be68e56bb4d6f77d6eecb486355d0898de722f22ca5 SHA512 803fd64d73659c1e24e9cfbd566a881d676a4f7dab93291c1e4b94037e3243181d3f2e64d2dfcf664dea939df26081e338ce7878890c595b54a0a0ff27ca0224
+EBUILD qtractor-0.9.17.ebuild 1547 BLAKE2B 96f976ae7dbfd2063277d6bf63b73c425a386f5394c6f446ea49218ef69e7d8b62a9170851cc4100c63ecc015d876ef582c2b6d03cb6db85b217bad19c04b263 SHA512 839f7d51c0e9c8648a1dcced994128cbe99ab8be1edaafb6a0f6f06ff67d8082ad1c2c0b570978149529507d8e1edeee6244f487556789a31d0814d3214473a8
 MISC metadata.xml 860 BLAKE2B aa27e27262c24903643b09cced6d78b2e460d030ecfc420ea4f2feeb1056600e64a08ad4b750925a67a18fcb44929169cb2461f2a277713a5bc56948b83e28e3 SHA512 fe3eb53d21b4595741f6c7f8dd8b290012db53ad843727fde8df513b5c0b599f1964b6e0603c9ba152e683a0df68a332ccff4c2274409c17a1c0fe1e74949249
diff --git a/media-sound/qtractor/files/qtractor-0.9.17-dont-compress-manpages.patch b/media-sound/qtractor/files/qtractor-0.9.17-dont-compress-manpages.patch
new file mode 100644
index 000000000000..cb4d5a4bbae7
--- /dev/null
+++ b/media-sound/qtractor/files/qtractor-0.9.17-dont-compress-manpages.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.in b/Makefile.in
+index 42849a9..3f05f9d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -346,10 +346,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/qtractor/qtractor-0.9.16.ebuild b/media-sound/qtractor/qtractor-0.9.16.ebuild
index 52e2dec5d0e4..f4986fa3a51a 100644
--- a/media-sound/qtractor/qtractor-0.9.16.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
 
diff --git a/media-sound/qtractor/qtractor-0.9.15.ebuild b/media-sound/qtractor/qtractor-0.9.17.ebuild
index f4986fa3a51a..bc0c143c3e97 100644
--- a/media-sound/qtractor/qtractor-0.9.15.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
 
@@ -44,7 +44,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.9.13-dont-compress-manpages.patch"
+	"${FILESDIR}/${P}-dont-compress-manpages.patch"
 )
 
 src_configure() {
diff --git a/media-sound/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest
index 11f5eefe5f7f..c960b6b7b0a1 100644
--- a/media-sound/sooperlooper/Manifest
+++ b/media-sound/sooperlooper/Manifest
@@ -1,4 +1,4 @@
 DIST sooperlooper-1.6.5-m4.tar.bz2 1463 BLAKE2B b02010f5aae113078d167b65a8ab232673eac622ae6595d23f4759fafa05aeb503ea30ace950b3e9cb4d85abe92af7eda13e4c5a3199630c83f2761c812bc9f7 SHA512 01b4405dcd91e617c8dafb9fcfab99507d0a9637d9b0eec84276c348968e31159b68ce5c8b7f900ab8a830f2b5c91b798146d5272d006a2b866f149e485f228d
 DIST sooperlooper-1.7.4.tar.gz 857069 BLAKE2B 0e7f13195a73ec9e41deaf93443c612bd2e44a3133dcc5685a3da497bfdc2acb24c5de33ea853c79e3c1a13c552d19f06370d96fe8fd17569c6e94541d035f5f SHA512 f2921346759ad3821c43cc75d77e3a5b3a5433e03204048580e36cd2cddb08bd2447e509e01e01fcce4585a1759a913fd01fd098a50d9bcdb30f8dde6cc509c2
-EBUILD sooperlooper-1.7.4.ebuild 1332 BLAKE2B 3d49a16370ba0042ad3221ac714302963a5f2a785ec6a793a826b107de3ce0f0a082e39b2c8ed6ad1b4f8a9129667d2151087199b9faf54b4f5eb174d881bc65 SHA512 8501cc4879ced833646e13a79379e0d9a670720d099cefeb43c5b1a313fa09c46924714453f3ebb097de2a2293bd27ef45b0c859d96f59c361b254525750cd6a
+EBUILD sooperlooper-1.7.4.ebuild 1330 BLAKE2B cbf211a937dbc3d4e11a276c61c18438a2c1dc61ebaf366bc4ce53d88827454d8494f459c220c5d33496fa2a5d9047ef8a9c2982e4141c23f881217cc4e34064 SHA512 c366b1f0ff061b4460d18ea4a7f386f909bb358073fad346ebd6c1f8e6d2afc2ff472066a7b84d456cd9c3895293454dc6873f8ea52d3e77027e93a8bc3a33df
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/sooperlooper/sooperlooper-1.7.4.ebuild b/media-sound/sooperlooper/sooperlooper-1.7.4.ebuild
index 3e5a9107cf31..fcb4278b1f9e 100644
--- a/media-sound/sooperlooper/sooperlooper-1.7.4.ebuild
+++ b/media-sound/sooperlooper/sooperlooper-1.7.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://essej.net/sooperlooper/${P/_p/-}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="wxwidgets"
 
 BDEPEND="
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index efa272562563..0e6978f7e7bd 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,8 +1,10 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.1.10.546.ge08ef575-19_amd64.deb 114975574 BLAKE2B 46da17c8ebccdc889b723ac6e9f5275dddec97d35142606ece32d1edb1ed288d1c517d41027de22da77421a76f8c00ea90ddc868b74dd46ba07cff60a581b12a SHA512 f004083eee00600a51e50d7dee03846293b5ccd6966786e91055564c7963917b9aaa917de41f299a0f5b7baecea5f466fb37722b8631743ff2ca15f43851f5f4
 DIST spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb 120102446 BLAKE2B 481686c9e1f7e8d7b68059ec5aad5f71ae1e59af80fa91903941afc2e0a91e2f957860bf96ce3ce4b19884f2548426269a9a2043c2985b4bbc82c5f091f5f2b8 SHA512 af9f1beafe0e4d2313326d1a55675550e8c3fcd5cd2dc0954127094c563048b98f74f669d99a10f0ef6e3b3405856bb9d6a2561644a434ab6bade9c812296963
+DIST spotify-client_1.1.42.622.gbd112320-37_amd64.deb 126293582 BLAKE2B 909d2cba7a2d2686a4e278e315658d8011d83f3eca3b5381fcd1df574d8e4223c3fb8508f417ec9f66b37740ac8b221a6d8cf753fc2cee47700b45a867556302 SHA512 a3fe98d69460ffd641df3219c2a3d164a33e2b52c86a56276e473dd5c3a43d6304df3b77fefcf0ca6c09cb6e2c8dacab65573cf7543725b6c8d402832149e122
 EBUILD spotify-1.0.72-r1.ebuild 3217 BLAKE2B 83f0aac50e11c914b2e63f0dbfb6245019cccd1a4a3307bc71e7ca897d890c9119a4a0df1d1bd5fa28156cf86b4eb56f4aeefbfc07d03ddbb4c0626e8c201aee SHA512 329198467357064fc1a556437928f2d59ab0b6262c82c0435638338b8b94adac031f94a9dc4f7cad4b11345ca5f0a5e1caa13168dcdd2d1224883f6a3aa42422
 EBUILD spotify-1.1.10-r1.ebuild 3155 BLAKE2B d3bc28ef679c0307add8cb7b496cedf3a47dededc46c624b9a14b4b2e31fd40fffaafca87f084519db86b33312fa6f30c64bb222acdbac99dcffee8cc537191b SHA512 5f9fb840160b3b5a11af49836f10735aac5d3cacf21f429e554b63d6b3d924401eb3f3d73b1ef0abeef5c2a1d74fe3be24a740f8a2eb2069c8b29b9f50fb07db
 EBUILD spotify-1.1.26-r1.ebuild 3193 BLAKE2B 35f3f47bdaeed4ce6b20b7d856f2b35b3c3930c4347edc807ab72fb9cc3b5a084729ec1223c10155f1cc2801210debd89785ebad819e9bcb265aea247f194520 SHA512 a5ca516fa5cbfcccfa7edd49a860487283e7a3feaf832f2f252291438468f2db3c8c1e855bc0d09d09ab36a995bb88298c3c321ce0ddafa66f23a64de2306553
 EBUILD spotify-1.1.26-r2.ebuild 3449 BLAKE2B 28e9a400ad3bf321efb845b7ad396bc399bda2aeb1c1a3acfdc0dbd1b747c971eb8b59c2c073b8126a0ae056e937cea6c32b4ebd648f0e753cc0a98db0e84618 SHA512 f9e16593cf0c5d8ea6c7f35f984e1a23cda928ec2ea7f2140c6635ee1e46aa80e7f1b0e6bcbd031416f92e8e60504dc07df0a8fd85b85552303086e1ed2f56b1
+EBUILD spotify-1.1.42.ebuild 3449 BLAKE2B d63ce19c0e4279cd79d325110b4d343d2e1f9b8fd8bbda2ebebf76ef67d3fe8c366895e5efb2de35821a00b1cffc96896521a04c8463abd596b905654c6c655a SHA512 270cb9da8ee5eb4b427bc472cc1972efee50449fff30c3ac524dea57d4a313603e3642900cedfb6b6204bfef08112fff53fbb2b3c9279c2bd14ae303312ca83a
 MISC metadata.xml 542 BLAKE2B 112c082ca9d2775e0225eadf3ec24260438db4ec3122be340395edae3096f378ddb349275fe5c31435c5196d606d099812fea831d06ce2ac913ddc777e65d66d SHA512 a414c96da5c9c5af23491937a86edf26ca5207f4cd9277a187059f2196b8ce9b28cab80f0ee5a326911a9aa5945d2604bea310608bc5270e507fb8052e1bd2ef
diff --git a/media-sound/spotify/spotify-1.1.42.ebuild b/media-sound/spotify/spotify-1.1.42.ebuild
new file mode 100644
index 000000000000..4b9dc6ccaf58
--- /dev/null
+++ b/media-sound/spotify/spotify-1.1.42.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop pax-utils unpacker xdg
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+BUILD_ID_AMD64="622.gbd112320-37"
+SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify libressl systray pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+BDEPEND=">=dev-util/patchelf-0.10"
+RDEPEND="
+	dev-libs/nss
+	dev-python/dbus-python
+	dev-python/pygobject:3
+	libnotify? ( x11-libs/libnotify )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/harfbuzz
+	media-libs/mesa[X(+)]
+	net-misc/curl[ssl]
+	net-print/cups[ssl]
+	pulseaudio? ( media-sound/pulseaudio )
+	!pulseaudio? ( media-sound/apulse )
+	systray? ( gnome-extra/gnome-integration-spotify )
+	x11-libs/gtk+:2
+	app-accessibility/at-spi2-atk
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libSM
+	x11-libs/libICE
+"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="
+	opt/spotify/spotify-client/spotify
+	opt/spotify/spotify-client/libEGL.so
+	opt/spotify/spotify-client/libGLESv2.so
+	opt/spotify/spotify-client/libcef.so
+	opt/spotify/spotify-client/swiftshader/libEGL.so
+	opt/spotify/spotify-client/swiftshader/libGLESv2.so
+"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for systray integration
+	if use systray ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+
+	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
+	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
+		|| die "failed to patch libcurl library dependency"
+}
+
+src_install() {
+	gunzip usr/share/doc/spotify-client/changelog.gz || die
+	dodoc usr/share/doc/spotify-client/changelog
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+}
diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index 8aa845a15743..981763ff766c 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,3 +1,3 @@
 DIST vmpk-0.7.2.tar.bz2 438006 BLAKE2B 78b1f50ce4ec6a430e4b82b500687261c448043d07fcd8e5a8fabcf0554f0488b7a87abf4a208a1d102a86c7b399c0637210c23f7d5b45a5166d6909aeb26b1f SHA512 69e31d6fd91a6604b7482b18840ed0b274723f380d7fe59827391e9031c3c670cb4e331c8bff01aacf6271973689f0bdb8c1dad4b749524095b398063634a477
-EBUILD vmpk-0.7.2.ebuild 847 BLAKE2B ed6edfef3cd34a349208c01b2aa7c967f2ecbcab910b497fa72c137b73161349f442a069fe976ff40fa139c378296061fb2af9a8652306396dff71ebe21751d7 SHA512 10d0cd6186d6eed5832c7dcbb3deb0e0cad1f461d8f371e79140fe8feab8d0885e2493f3842384b8b6a6bfbacb6ac7c18049a0b41e4d784351da4fdd7310d41a
+EBUILD vmpk-0.7.2.ebuild 846 BLAKE2B 9d420cf18445e2cf2c76384867fda6070e79068e598de67017a362b911733a26551f71106a7d71ee87e862e55767c4a8c6fe81942661ac02cae6a274e2eda3a4 SHA512 12871444e941d662ed1055301fc2983f15b46f04a3b1ce3879bb13b8a7abfd4e14720235d68186495552aa0a5c624c9ef78ad93ca6d93fcd5e8d7c0a53d459a0
 MISC metadata.xml 856 BLAKE2B 53282a0d72578eb72aa6d3ae3704e915626f12b88315be54f0342cd9b97312fed2c3628871fe7c1215d29b6984c9b829b0718d124effa46eeaf52dd6509e35be SHA512 2186fd4b256c33f617fef45833bacba660d536141b77e520ad811c02363d1238765c13ec8bd125cf12b0e77589ad7c4f189747553c956ff9d2590e8a84b345d0
diff --git a/media-sound/vmpk/vmpk-0.7.2.ebuild b/media-sound/vmpk/vmpk-0.7.2.ebuild
index d8fd8a69c85f..40112aac1424 100644
--- a/media-sound/vmpk/vmpk-0.7.2.ebuild
+++ b/media-sound/vmpk/vmpk-0.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus"
 
 BDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
commit	8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree	230f3135ceaace633cf93e9838b185c4a6664c2e /media-sound
parent	9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)