gentoo resync : 10.09.2021

32 files changed, 234 insertions, 438 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 6c90dcfedb88..25ac0a6b4f7a 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index 43d0c7b9cdd3..b05d5be3676a 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,3 +1,3 @@
 DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
-EBUILD alsaplayer-0.99.81-r2.ebuild 2012 BLAKE2B dbdff76d6d6913f16b747fb01138278fb4c650260ad7287b3c98f74a3bc57862fcff514c418caa7820824c201420f691f5e99160bdc0feab36c20c4f43f0aca7 SHA512 c29b3d7d516ecc75a58b08b9a474b368031d3850e167e9599a1d78d1da27c886e0a39cbee4fc92c37b2db7e0ec702be7153e56fb5e2cd03c523450d2b4c0250e
+EBUILD alsaplayer-0.99.81-r2.ebuild 2019 BLAKE2B e3f5efd733fab5ee7d6078e176f506912b868f3a9d10675a3c003056e4ccee92381816536ef3e456f5bd11c701bbd467eaff91cc5925ce799b7a04b8efeeca8f SHA512 c6b2869f0366f409674cda5a68d59b4d112f3845522a60896131ad85fa9a2db3e7d0409009c92837be8d6edc1464b67842096bfb837d711766c7684d86257c79
 MISC metadata.xml 337 BLAKE2B 1f60abc42f95db4e9876c4894ddc16175f17d35b53c7d9fcd425e0124d3fdf08978b349cf2364cfc32555408d1e5ec011fc6367ac9d3e4b7260cf0d2d665522e SHA512 eb9f49ef0aaa5f6ec8c8a29f0459cde3fbbcce419217ae9c22ed6f50dea1893e02037b556daa4276de62aa18fd3193d8c213c6b819d701689fea845d64f97f61
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild
index b25a79761980..098fdbbe3336 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~sparc x86"
+KEYWORDS="amd64 ~mips ~ppc ~riscv ~sparc x86"
 IUSE="+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd"
 
 RDEPEND="
diff --git a/media-sound/audicle/Manifest b/media-sound/audicle/Manifest
deleted file mode 100644
index 55961f82d4d9..000000000000
--- a/media-sound/audicle/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX audicle-1.0.0.6-font.patch 2862 BLAKE2B e22a130850bc10ab14bd101a581d936629742113b1c4e727a87066f0179e6739f74ac5a8f9349f588bd25fa697330488575d3d1943246d7039123b8dba474b01 SHA512 4cb763b5b38c5e3768d8da38129bdd6fd281c818adfa1ec7e28fcec1c1352d0d677408f3f79ee96ee64ace40e49722b8f2f9c12e3cac9206e0afd72949a95d31
-AUX audicle-1.0.0.7-const.patch 455 BLAKE2B b030468b23e5a05b2a79c72be9f44e61a31c7cc15ec3fdee9878f8d584c208f0f4e23680034ec722ace8e1e9544462623e3c60d8f90ebe1f5971f6ff7e2ae5e4 SHA512 203e760a772f4283e5add18883091d819935226a0fa82a56bc79ff585a2450d08067fee0b3a4a4b6421f393c707d41d342966c5dc72527fb59cb877c1041079f
-AUX audicle-1.0.0.7-gcc43.patch 2777 BLAKE2B 5b0be13a8a91de81ccc0c3bc54978b43bbeeba187493890ec9192f03259bd9d8b3b2e215a8c781c662cf9bcbb815f71ffdbe98b234eb62bc66c138e9017a7f98 SHA512 e9858e7c7cea35d8f5af5c4c8ca22c80c030eb14bd8798cb617b86bc55067413d3875c9cc30700c2a3aa86a5439dd60708a266acd41195280e744affa89503cf
-AUX audicle-1.0.0.7-hid-smc.patch 3181 BLAKE2B bfdaf969b98c77449a46f79a7f20be976028821f7136413838cb05dcf7fc33d98d4d822c0202e8f631670b802060191e52a8115354b53480c64833b6b7efd215 SHA512 8092d8de0fb6aea240e38c98a45218c002e78af0b1d7b285bca8d9d81ae77a76b15b0db57aaf42c70a65fd52c8ced89c0e31b22213654ba52ac3105f2a764ff5
-DIST audicle-1.0.0.7.tgz 5561088 BLAKE2B 7056880aa6b902e15e7722d9532736b8d513c6e9135b2b5afb839783e3df83f4e1f29f8c73b0f652d920029f6eb12dd7af1a699cb487b9ad0f76229f6ebd6fae SHA512 c96506620e22e1f7846288cb4f34dc7efe59e14d845425673524d0a89712ea7d3dabed546eb921220e021d4e8526937990a4f5764fbf2bb90339b993f6703772
-EBUILD audicle-1.0.0.7-r2.ebuild 2395 BLAKE2B 92c0e6881575eafdf168e26d593a8aff46f53f2ae97d7c615ae58f87c6165bd6cc10ee4962b6062b5f90d20abffc714bf682df5ab8a799ea31c6aba5b618d423 SHA512 eda677f65129704a09fb5e8f7f4a0812f1fcaacdc13310cfbca60a3fd29b54cbc3c8895a18dfdb8ca21b9ebfffca8902c41b43bab3b3cc9da2888af355f6532f
-MISC metadata.xml 386 BLAKE2B 77bb79297d16b8580b574e44a07ec2b8d5ec323528e804aef9e35f7274731e2e46976661b3089fd8d526491984f9564d3dd528564c8559e027b26d2fe3ba3bff SHA512 df4591da51216c3a5b15ef353db9b5666b7e5e4082f3e8214a596a9ab7a344c5e64178c437fe2d15b9f8b5eb1ace88e6ed800595f3b94ebb17c972fe91bed414
diff --git a/media-sound/audicle/audicle-1.0.0.7-r2.ebuild b/media-sound/audicle/audicle-1.0.0.7-r2.ebuild
deleted file mode 100644
index 7ea60ba2f27f..000000000000
--- a/media-sound/audicle/audicle-1.0.0.7-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A Context-sensitive, On-the-fly Audio Programming Environ/mentality"
-HOMEPAGE="http://audicle.cs.princeton.edu/"
-SRC_URI="http://audicle.cs.princeton.edu/release/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa jack oss truetype"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-DEPEND="
-	app-eselect/eselect-audicle
-	media-libs/freeglut
-	media-libs/libsndfile
-	virtual/opengl
-	virtual/glu
-	x11-libs/gtk+:2
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	jack? ( virtual/jack )
-	truetype? (
-		media-fonts/corefonts
-		media-libs/ftgl
-	)
-"
-rDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( alsa jack oss )"
-
-DOCS=( AUTHORS PROGRAMMER README THANKS TODO VERSIONS )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0.6-font.patch"
-	"${FILESDIR}/${P}-hid-smc.patch"
-	"${FILESDIR}/${P}-gcc43.patch"
-	"${FILESDIR}/${P}-const.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's@../ftgl_lib/FTGL/include@/usr/include/FTGL@' \
-		-e 's@../ftgl_lib/FTGL/mac/build@/usr/lib@' \
-		-e 's/gcc -o/$(CC) -o/' \
-		-e 's/-O3 -c/-c $(CFLAGS)/' \
-		-e 's/$(LIBS)/$(LDFLAGS) $(LIBS)/' \
-		src/makefile.{alsa,jack,oss} || die "sed failed"
-}
-
-compile_backend() {
-	local backend="$1"
-	local config
-	use truetype && config="USE_FREETYPE_LIBS=1"
-	einfo "Compiling against ${backend}"
-	cd "${S}/src"
-	emake -f "makefile.${backend}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" LEX=flex \
-		YACC=bison ${config}
-	mv audicle{,-${backend}}
-	emake -f makefile clean
-}
-
-src_compile() {
-	# when compile with athlon or athlon-xp flags
-	# audicle crashes on removing a shred with a double free or corruption
-	# it happens in Chuck_VM_Stack::shutdown() on the line
-	#   SAFE_DELETE_ARRAY( stack );
-	replace-cpu-flags athlon athlon-xp i686
-
-	use jack && compile_backend jack
-	use alsa && compile_backend alsa
-	use oss && compile_backend oss
-}
-
-src_install() {
-	use jack && dobin src/audicle-jack
-	use alsa && dobin src/audicle-alsa
-	use oss && dobin src/audicle-oss
-	dodoc ${DOCS[@]}
-}
-
-pkg_postinst() {
-	elog "Audicle now can use many audio engines, so you can specify audio engine"
-	elog "with audicle-{jack,alsa,oss}"
-	elog "Or you can use 'eselect audicle' to set the audio engine"
-
-	einfo "Calling eselect audicle update..."
-	eselect audicle update --if-unset
-}
diff --git a/media-sound/audicle/files/audicle-1.0.0.6-font.patch b/media-sound/audicle/files/audicle-1.0.0.6-font.patch
deleted file mode 100644
index 9e2658df16c3..000000000000
--- a/media-sound/audicle/files/audicle-1.0.0.6-font.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -ru audicle-1.0.0.6~/src/audicle_font.cpp audicle-1.0.0.6/src/audicle_font.cpp
---- audicle-1.0.0.6~/src/audicle_font.cpp	2008-03-30 00:29:37.000000000 +0100
-+++ audicle-1.0.0.6/src/audicle_font.cpp	2008-03-30 01:04:46.000000000 +0100
-@@ -201,13 +201,13 @@
- #ifdef __PLATFORM_WIN32__
- char fontpath[] = "C:\\WINDOWS\\FONTS\\";
- #else
--char fontpath[] = "/define/this/directory/";
-+char fontpath[] = "/usr/share/fonts/corefonts/";
- 
- #endif
- #endif
- 
--char kernedfontfile[] = "FTGL:verdana.TTF";
--char monospacedfontfile[] = "FTGL:LUCON.TTF";
-+char kernedfontfile[] = "FTGL:verdana.ttf";
-+char monospacedfontfile[] = "FTGL:couri.ttf";
- 
- 
- class AudicleFTGLFont : public AudicleFont { 
-@@ -301,13 +301,11 @@
- #endif
- 
-     // we should do a directory scan here...
--    AudicleFont::available_fonts().push_back( "FTGL:ARIAL.TTF" );
--    AudicleFont::available_fonts().push_back( "FTGL:ARIBLK.TTF" );
--    AudicleFont::available_fonts().push_back( "FTGL:BYTE.TTF" );
--    AudicleFont::available_fonts().push_back( "FTGL:COUR.TTF" );
--    AudicleFont::available_fonts().push_back( "FTGL:LUCON.TTF" );
--    AudicleFont::available_fonts().push_back( "FTGL:TIMES.TTF" );
--    AudicleFont::available_fonts().push_back( "FTGL:verdana.TTF" );
-+    AudicleFont::available_fonts().push_back( "FTGL:arial.ttf" );
-+    AudicleFont::available_fonts().push_back( "FTGL:ariblk.ttf" );
-+    AudicleFont::available_fonts().push_back( "FTGL:cour.ttf" );
-+    AudicleFont::available_fonts().push_back( "FTGL:times.ttf" );
-+    AudicleFont::available_fonts().push_back( "FTGL:verdana.ttf" );
- 
- }; 
- 
-diff -ru audicle-1.0.0.6~/src/audicle_ui_base.cpp audicle-1.0.0.6/src/audicle_ui_base.cpp
---- audicle-1.0.0.6~/src/audicle_ui_base.cpp	2008-03-30 00:29:37.000000000 +0100
-+++ audicle-1.0.0.6/src/audicle_ui_base.cpp	2008-03-30 00:30:32.000000000 +0100
-@@ -47,8 +47,8 @@
- void init_UI_Fonts() { 
-     if ( _ui_fonts_inited ) return;
- #ifdef _USE_FTGL_FONTS_
--    labelFont = AudicleFont::loadFont ( "FTGL:verdana.TTF" );
--    labelFontMono = AudicleFont::loadFont ( "FTGL:LUCON.TTF" );
-+    labelFont = AudicleFont::loadFont ( "FTGL:verdana.ttf" );
-+    labelFontMono = AudicleFont::loadFont ( "FTGL:couri.ttf" );
- #else
-     labelFont = AudicleFont::loadFont ( "OpenGL:variable" ); 
-     labelFontMono = AudicleFont::loadFont ( "OpenGL:variable" ); 
-diff -ru audicle-1.0.0.6~/src/audicle_ui_editor.cpp audicle-1.0.0.6/src/audicle_ui_editor.cpp
---- audicle-1.0.0.6~/src/audicle_ui_editor.cpp	2008-03-30 00:29:37.000000000 +0100
-+++ audicle-1.0.0.6/src/audicle_ui_editor.cpp	2008-03-30 00:30:32.000000000 +0100
-@@ -46,7 +46,7 @@
- 
- void init_Buffer_Font() { 
- #ifdef _USE_FTGL_FONTS_
--    bufferFont = AudicleFont::loadFont ( "FTGL:LUCON.TTF" );
-+    bufferFont = AudicleFont::loadFont ( "FTGL:couri.ttf" );
- #else
-     bufferFont = AudicleFont::loadFont ( "OpenGL:mono" );
- #endif
diff --git a/media-sound/audicle/files/audicle-1.0.0.7-const.patch b/media-sound/audicle/files/audicle-1.0.0.7-const.patch
deleted file mode 100644
index 38acbf2f2ede..000000000000
--- a/media-sound/audicle/files/audicle-1.0.0.7-const.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru audicle-1.0.0.7.orig//src/audicle_font.cpp audicle-1.0.0.7/src/audicle_font.cpp
---- audicle-1.0.0.7.orig//src/audicle_font.cpp	2012-03-17 10:23:39.000000000 +0100
-+++ audicle-1.0.0.7/src/audicle_font.cpp	2012-03-17 10:49:24.000000000 +0100
-@@ -215,7 +215,7 @@
- protected :
-     FTFont * m_font;
- public: 
--    AudicleFTGLFont( char * name ) { 
-+    AudicleFTGLFont( const char * name ) { 
-         
-         glEnable ( GL_TEXTURE_2D );
-         
diff --git a/media-sound/audicle/files/audicle-1.0.0.7-gcc43.patch b/media-sound/audicle/files/audicle-1.0.0.7-gcc43.patch
deleted file mode 100644
index f6fc08e7da47..000000000000
--- a/media-sound/audicle/files/audicle-1.0.0.7-gcc43.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/chuck_vm.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/chuck_vm.cpp
---- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/chuck_vm.cpp	2012-03-17 10:23:39.000000000 +0100
-+++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/chuck_vm.cpp	2012-03-17 10:27:23.000000000 +0100
-@@ -48,6 +48,7 @@
- #else
-   #include <unistd.h>
-   #include <pthread.h>
-+  #include <algorithm>
- #endif
- 
- 
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: chuck_vm.cpp.orig
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: rtaudio.cpp.orig
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: rtaudio.cpp.rej
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_stk.cpp.orig
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_stk.cpp.rej
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_xxx.cpp.orig
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_xxx.cpp.rej
-diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp
---- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:23:39.000000000 +0100
-+++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:27:23.000000000 +0100
-@@ -38,6 +38,7 @@
- #include <limits.h>
- #include <vector>
- #include <map>
-+#include <climits>
- 
- using namespace std;
- 
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: util_hid.cpp.orig
-diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_opsc.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_opsc.cpp
---- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_opsc.cpp	2012-03-17 10:23:39.000000000 +0100
-+++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_opsc.cpp	2012-03-17 10:27:23.000000000 +0100
-@@ -57,6 +57,7 @@
- #include <netinet/tcp.h>
- #include <arpa/inet.h>
- #include <netdb.h>
-+#include <algorithm>
- #endif
- 
- #if defined(__MACOSX_CORE__)
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: util_opsc.cpp.orig
-diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_string.h audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_string.h
---- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_string.h	2012-03-17 10:23:39.000000000 +0100
-+++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_string.h	2012-03-17 10:27:23.000000000 +0100
-@@ -36,6 +36,7 @@
- #include "chuck_def.h"
- #include <string>
- #include <vector>
-+#include <cstdio>
- 
- 
- // itoa
-diff -ru audicle-1.0.0.7.orig//src/audicle_def.h audicle-1.0.0.7/src/audicle_def.h
---- audicle-1.0.0.7.orig//src/audicle_def.h	2012-03-17 10:23:39.000000000 +0100
-+++ audicle-1.0.0.7/src/audicle_def.h	2012-03-17 10:28:40.000000000 +0100
-@@ -39,8 +39,9 @@
- 
- #include "chuck_def.h"
- 
--#include <stdio.h>
--#include <math.h>
-+#include <cstdio>
-+#include <cmath>
-+#include <algorithm>
- #include <assert.h>
- #ifndef __PLATFORM_WIN32__
-   #include <unistd.h>
diff --git a/media-sound/audicle/files/audicle-1.0.0.7-hid-smc.patch b/media-sound/audicle/files/audicle-1.0.0.7-hid-smc.patch
deleted file mode 100644
index d362ed06423a..000000000000
--- a/media-sound/audicle/files/audicle-1.0.0.7-hid-smc.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp
---- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:23:39.000000000 +0100
-+++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:25:03.000000000 +0100
-@@ -7392,14 +7392,139 @@
- int WiiRemote_send( const HidMsg * msg ){ return -1; }
- const char * WiiRemote_name( int wr ){ return NULL; }
- 
-+#define SYSFS_TILTSENSOR_FILE "/sys/devices/platform/applesmc/position"
-+#define TILTSENSOR_BUF_LEN 32
-+
-+static struct t_TiltSensor_data
-+{
-+	union
-+	{
-+		struct t_macbook
-+		{
-+			int x;
-+			int y;
-+			int z;
-+		} macbook;
-+	} data;
-+	int dataType;
-+	int detected;
-+	int refcount;
-+
-+	t_TiltSensor_data()
-+	{
-+		refcount = 0;
-+		dataType = -1;
-+		detected = 0;
-+	}
-+
-+} TiltSensor_data;
-+enum
-+{
-+	linuxAppleSMCMacBookDataType
-+};
-+static int TiltSensor_detect()
-+{
-+	int fd;
-+
-+	fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
-+
-+	if (fd > 0)
-+	{
-+		TiltSensor_data.dataType = linuxAppleSMCMacBookDataType;
-+		TiltSensor_data.detected = 1;
-+		close(fd);
-+		return 1;
-+	}
-+
-+	TiltSensor_data.detected = -1;
-+
-+	return 0;
-+}
-+
-+static int TiltSensor_do_read()
-+{
-+
-+	switch(TiltSensor_data.dataType)
-+	{
-+		case linuxAppleSMCMacBookDataType:
-+			char buf[TILTSENSOR_BUF_LEN];
-+			int ret, fd;
-+			fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
-+
-+			if (fd < 0) {
-+				return -1;
-+			}
-+			ret = read(fd, buf, TILTSENSOR_BUF_LEN);
-+			if (ret < 0) {
-+				close(fd);
-+				return -1;
-+			}
-+			if (sscanf(buf, "(%d,%d,%d)\n", &TiltSensor_data.data.macbook.x, &TiltSensor_data.data.macbook.y, &TiltSensor_data.data.macbook.z) != 3) {
-+				close(fd);
-+				return -1;
-+			}
-+			close(fd);
-+			break;
-+		default:
-+			return 0;
-+	}
-+	return 1;
-+}
- void TiltSensor_init(){}
- void TiltSensor_quit(){}
- void TiltSensor_probe(){}
--int TiltSensor_count(){ return 0; }
--int TiltSensor_open( int ts ){ return -1; }
--int TiltSensor_close( int ts ){ return -1; }
--int TiltSensor_read( int ts, int type, int num, HidMsg * msg ){ return -1; }
--const char * TiltSensor_name( int ts ){ return NULL; }
-+int TiltSensor_count()
-+{
-+	if(TiltSensor_data.detected == 0)
-+		TiltSensor_detect();
-+
-+	if(TiltSensor_data.detected == -1)
-+		return 0;
-+	else if(TiltSensor_data.detected == 1)
-+		return 1;
-+
-+	return 0;
-+}
-+int TiltSensor_open( int ts )
-+{
-+	if(TiltSensor_data.detected == 0)
-+		TiltSensor_detect();
-+
-+	if(TiltSensor_data.detected == -1)
-+		return -1;
-+
-+	TiltSensor_data.refcount++;
-+
-+	return 0;
-+}
-+int TiltSensor_close( int ts )
-+{
-+	TiltSensor_data.refcount--;
-+
-+	return 0;
-+}
-+int TiltSensor_read( int ts, int type, int num, HidMsg * msg )
-+{
-+
-+	if(TiltSensor_data.detected == -1)
-+		return -1;
-+
-+	if(!TiltSensor_do_read())
-+		return -1;
-+
-+	if(TiltSensor_data.dataType == linuxAppleSMCMacBookDataType)
-+	{
-+		msg->idata[0] = TiltSensor_data.data.macbook.x;
-+		msg->idata[1] = TiltSensor_data.data.macbook.y;
-+		msg->idata[2] = TiltSensor_data.data.macbook.z;
-+	}
-+
-+	return 0;
-+}
-+const char * TiltSensor_name( int ts )
-+{
-+	return "Apple Sudden Motion Sensor";
-+}
- 
- 
- #endif
-Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: util_hid.cpp.orig
diff --git a/media-sound/audicle/metadata.xml b/media-sound/audicle/metadata.xml
deleted file mode 100644
index 69313e7770a3..000000000000
--- a/media-sound/audicle/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		a potentially new type of audio programming environment that integrates
-		the programmability of the development environment with elements of the
-		runtime environment
-	</longdescription>
-</pkgmetadata>
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 723596a7f249..a595a96ddf9b 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -3,6 +3,6 @@ AUX 1.4.9-0002-Disable-test_completion.patch 2879 BLAKE2B 7f1b21d92ec93e3a2606a4
 AUX 1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch 698 BLAKE2B f7064a5db51e53d70b6d30332c3f6e039873461931c5e4052136675013728792fbc98f561f6fcf62432f58bc7702e54f34d04c43586d9a07ecdc789019aec040 SHA512 3e3af6d760596a08fac6130912ed5780795975e0ade8c4f27f577453b82cbc588de9d23d9d2c1672841913d5627fe684cd8373670851e59b6fe1e0a57b138009
 AUX 1.4.9-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch 4650 BLAKE2B 446977fdf23aeaa1afaa85bb16f8dfddc3e7a00af8253a061afbf78d4667979119653ac16af7dc3e24f92606437bdcc4066907ab3ac053e97712c0dd12819b9f SHA512 8f647eb5b87a91ed9c65f9d819980d1f6da740b76b4265288e5e29d614854062bd5769a1ebb1e0a1428fa7aeabe01f1827364c0639db0d2383c4e5dec7bc64fd
 DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
-EBUILD beets-1.4.9-r6.ebuild 4393 BLAKE2B c8a66034c1dcb5e49a8d974ff3b588e79720ff3378e3d0a013a672e665746afad84ae0373e1aedff868ece0a8b67cc7a8dd679f9fcfc3c120af3dd1a3e0efd56 SHA512 b9d99d86300f6a6dd29065826cf73964d7c8f1ff9ece68b5fe8ed0939b53a0e6371c9add469b22034e1f6ca82a033aa6c22baa11db1f586ce67564263f6b1dac
-EBUILD beets-9999.ebuild 4308 BLAKE2B b1d3e3660fd6e0ac6dec3885036021359a31da3f4cc83371dd8c828fd5c67f768f179dbee56bac0f09fe69215f7b26abbf634db1618515feb752644a5f6c3268 SHA512 2e74fdb24b5a8d7908ab9d412abeb1d727cff6a9663cd2a23608490378325214b7d603c5bcc9874b9d5cc7a4b04d4b79624a095b5b30d298df2fcc3f6701cf42
+EBUILD beets-1.4.9-r6.ebuild 4394 BLAKE2B 875d18123f6494160f550ee63a5deeaea8166afd891de2265d2e6236144676a8c11e273206fd8cec3cd1a21c4efdc7a3488cbcb5c2451c5187807cea0cb5910c SHA512 b722b45ead4f00788d5b2fbae80af7f46dbdf6a94fb7f55424cdb7252bc04ab85aac99238055f30c74adbb5c9c0e40b2057ea90b10293e379bdede302cb8b29a
+EBUILD beets-9999.ebuild 4309 BLAKE2B 3c00103165f4637bc442c2967edbc6d2ba3883af5bfffa1b868f8194c54b0bc77e6e6a8be4f0cb40492abd7604d0a729f53ff001f4b3b6208a2cdddb53c5bd14 SHA512 e512550a1970939c688c5fa603ee450b1fde719efa027a4e45e07a9b7afc0bfcab8aabff56d126371b82753d73122bdbc58acea7550fe7241cfef93646155ca8
 MISC metadata.xml 1781 BLAKE2B 25306614dd6eec756d4d593f72b27ad19a2809553642db7c836162c76d7086f29ddd50019dd5160c0ac67e448ce7ededa358d06e5ae91a13c96b9e25e6871e10 SHA512 fb2ca0157b42b86a7065320a14dade86dba95fbb55a3f24d0ca8b40cc5a31fdb5013f9d369e3220d8eaacd994f879c02f419769bf9a1b56d38156b7cc2f7f588
diff --git a/media-sound/beets/beets-1.4.9-r6.ebuild b/media-sound/beets/beets-1.4.9-r6.ebuild
index 286afb9330e4..eb091e432e08 100644
--- a/media-sound/beets/beets-1.4.9-r6.ebuild
+++ b/media-sound/beets/beets-1.4.9-r6.ebuild
@@ -51,7 +51,7 @@ BDEPEND="
 	$(python_gen_cond_dep '
 		test? (
 			dev-db/sqlite[icu]
-			dev-python/beautifulsoup[${PYTHON_USEDEP}]
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 			dev-python/bluelet[${PYTHON_USEDEP}]
 			dev-python/discogs-client[${PYTHON_USEDEP}]
 			dev-python/flask[${PYTHON_USEDEP}]
diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 18950a225ca1..e6e0f8dd5eb2 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -51,7 +51,7 @@ BDEPEND="
 	$(python_gen_cond_dep '
 		test? (
 			dev-db/sqlite[icu]
-			dev-python/beautifulsoup[${PYTHON_USEDEP}]
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 			dev-python/bluelet[${PYTHON_USEDEP}]
 			dev-python/discogs-client[${PYTHON_USEDEP}]
 			dev-python/flask[${PYTHON_USEDEP}]
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index ae0b0b62a0df..13915d2126de 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,5 +1,5 @@
 AUX cmus-2.9.1-atomic.patch 554 BLAKE2B 1a5e2b4497ed3ccc95bf5345607a8f4efedbff6852cb0abc40d0665180e0e74a25e17ba8bb121e1343f1964cf7523abdf987595c1eefc1486fd459bfb0b6a696 SHA512 9e64c6ff6184862e02c248b9a26cbde785740d622370bf761df949824ed8759825ad9bb208180f0d5d1aacd3c506994561c98690902b25cc34cbb87929e3c886
 DIST cmus-2.9.1.tar.gz 321004 BLAKE2B 1531d9ca8c1fd54ca487eb2b9ce8602f2d448dd80567a04bfc18449d60fbcd5286cd9f0d19983a885b2a532793c44d7dab8c1993ac8d7f5ada4f01ce670404d9 SHA512 b417e58a68c54e97db92b8760a49a3071e81f1594f2144911eed3ccceb68499dedf0699ae313babcb822d71b37add8880dfb2018686cb572e89f8627446d5e05
-EBUILD cmus-2.9.1-r1.ebuild 3708 BLAKE2B 3d2134bfbc561a3ad29c4bf6a0d9cefb7e38d6e65d619771c0f696e9e48d2d838d0cbe6dafd21feaee09fd75e3ef8617d7b329060e6a885179b6b16021749b64 SHA512 7eb1581f02ea726dadd38e1899f4b2526b18ed2fd895864d35fcab9c7bb255cca0e9df321fbb803aee6c044bb23ee9ca49c2a47f736fd9f05ca2588dd517cb31
+EBUILD cmus-2.9.1-r1.ebuild 3715 BLAKE2B f478e795669d9c69743761949c347cd8b32d32117a6066af75fc1f8299092918b313ad8a56538d831a59979817f801a76b550f4880af7532e20d3baf6083cd83 SHA512 09b656f86d37d7e67d7e1c625f2daaf9ba7846af3f93aa53c11f48e443fcdab68bb2d14d56c5ce9fa304925711f59147943d0e642e97131bb85d7c4f22f86ce1
 EBUILD cmus-9999.ebuild 3667 BLAKE2B da52cc5e70612f744fa9f4d8d4f86024078d7c796ec53e0449eb4a5e9d8c3e0c041dc55c0b361b84660db872ef33d03d07593b6b033b0a473cfde755868d593f SHA512 2a5e039d01cba09309d8a9de2d4e2ce54e1dffcf330cdfb212e28f13e91952b6a96be424e0230ea60e709e99f152d25b3907288fabd7a02763683cf3940758c5
 MISC metadata.xml 884 BLAKE2B f545c30b4f5c1f497b616e0a14bb26e760d528a36153de4fa8d74a745e2c6ea1207c1a3e4625fb8411261dede9d51239a1ade9b258fa1e95c93c4446548f824f SHA512 5976190ba4ffaa3ba0f9b6774ecfe1922ea4a998759bebcb5d8ae1697b09cc54833b352e171b9f3770800ab0145a0f072e576f25d4799d0a94253c211dcf8962
diff --git a/media-sound/cmus/cmus-2.9.1-r1.ebuild b/media-sound/cmus/cmus-2.9.1-r1.ebuild
index a6b4ad7154ab..3e7555517425 100644
--- a/media-sound/cmus/cmus-2.9.1-r1.ebuild
+++ b/media-sound/cmus/cmus-2.9.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Ncurses based music player with plugin support for many formats"
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 401f6347ebca..4f0ab9569ee0 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -4,5 +4,5 @@ DIST easyeffects-6.0.3.tar.gz 1905373 BLAKE2B f423cefd0e6124ee1128bf5a07fb23df03
 DIST easyeffects-6.1.0.tar.gz 1921987 BLAKE2B 419f8e88ff9fc1e40779f91efca4eb2b3145b1fcad885fd376a73d8b8dd3f7a0af43a73361e22c02e739503a3ca4d91885921848e3d8ef9186b2907b0e400476 SHA512 2a6ed01377f5bd4f6891980f2b22d499da8369207069b7869e146543ad125f274bbc61ab0f2608e8737b2650df0bedf0b619a3eb200e3444ddfd0ae8960bebfe
 EBUILD easyeffects-5.0.4-r1.ebuild 2272 BLAKE2B 9a0d0a24d713e2effca773730c0b7e7afaf83e4561b5bc83ca1459cada358e039e7b8fe7ded4c6dd6ec8f30ca8ea12d33fc65822b5ae2d812f320e71c2634a10 SHA512 b51edb7406290d1389ab8f98efa47c0739564ea8aee982acc27a4f544b5fd35211220b7361b7697b2d4f1b63e1d6e645016a4050c2ea482673e986dd314a31d0
 EBUILD easyeffects-6.0.3-r1.ebuild 1855 BLAKE2B 8a8f589feb8ad0bce561cd0cbb3f5ca083f0f37eddaf897b216aeda605eeb3e33c2b20428fe21864391da33720ddda0f8d26ba1faeb18f30ae5a20fb66ffc150 SHA512 8cd9c763ea0978c4a6f07594b41043f1256eff9c7e37f24cb13b180e6cb1baa3830912eb88ab8f6588462ea5e77c49ab0f97a1f33fb8203aecb47c45ed95e721
-EBUILD easyeffects-6.1.0.ebuild 1988 BLAKE2B 90665a9922351a93fde5b939acaa0e4ae9d56120c0bd81b355d0cdb6fce2eb04447331c4dad559edcf5c948ba58e026499b955cf3d624205e9c4f15639e8a650 SHA512 a739d70079ae34b8a2fd2f3ae4aeccd8c5e0c308cc35efa7daf3db5224ed899ed7dc6dde22981042cfb1dd6d85bbb2918e043b6539ca58168093d11b688fe11e
+EBUILD easyeffects-6.1.0.ebuild 1995 BLAKE2B 5e9b574dcf1121d5497af2feeb2e8c30e0eab2c003b09bcf87c14edd75be3135fdac40e7f10857fe45a459305a2596224f2cf106acdcff0bdf5efefca1035622 SHA512 7571ee5331c5a547cfa6385ad00e2f4c66be4c0ec5108ac543c471535b02647d60c2431b69645a85f8556579bf28a33816e6e8c0bc49d61e4207b8c47c7eaec1
 MISC metadata.xml 1195 BLAKE2B a9f9b0ceaba335b213579bf247c4fd84aaae38028681bcf1f290459a3055fb81cb628a76555624ad3a0344aad7e6db2a555e453f9681d25cf7cb3fe45444b08d SHA512 18b3bb086ed4da4a198f38abd1fac855dd4b0e2a205fd4a1d05f4db67c9be10e9f9145360d8896b9d30e12bb003e62e81298a68d762362460b6ad7466bec2082
diff --git a/media-sound/easyeffects/easyeffects-6.1.0.ebuild b/media-sound/easyeffects/easyeffects-6.1.0.ebuild
index a18718b2e2cc..a279cae4a3f9 100644
--- a/media-sound/easyeffects/easyeffects-6.1.0.ebuild
+++ b/media-sound/easyeffects/easyeffects-6.1.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
 else
 	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index d563f55a1a43..bfbbc0f9340f 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,6 +1,8 @@
 AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
-AUX hydrogen-9999-gnuinstalldirs.patch 1879 BLAKE2B bf1563cbedc0b3a6d2aefcfe6bbf1bfd7f44ea26456d18889d684763f9af8170aeacc5887182ea845093c5187e92da51298dcb44bd99d6c2f0c5a47adbe5ba7d SHA512 20cc8970301192c967866f27b344591a58747a3a501eaa1b5d92dfb82af48e98f5c9e4c7908084f2845d258f323cec0ec42b578797b1bc3447c9b1918cbbdaea
+AUX hydrogen-1.1.0-gnuinstalldirs.patch 1879 BLAKE2B bf1563cbedc0b3a6d2aefcfe6bbf1bfd7f44ea26456d18889d684763f9af8170aeacc5887182ea845093c5187e92da51298dcb44bd99d6c2f0c5a47adbe5ba7d SHA512 20cc8970301192c967866f27b344591a58747a3a501eaa1b5d92dfb82af48e98f5c9e4c7908084f2845d258f323cec0ec42b578797b1bc3447c9b1918cbbdaea
 DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d SHA512 7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9
+DIST hydrogen-1.1.0.tar.gz 11413446 BLAKE2B 8008336d2199bf36d9efca8875217e4a5f3d66c0274e25334525292e7864ca1dc4da75f86cbba981dfdbc19a3dbafebff503ce1ef597adae56fc467b44611a19 SHA512 116380be03f03a9294e278be5c7ede90fe088f21bf31db46a5e5df2684d11676e518200e6c4a187063c769f5b97950af9602b9b2694ca37788f73a2666265cc8
 EBUILD hydrogen-1.0.2.ebuild 2079 BLAKE2B 6edfa53c9d4609d76dd0923dbe9f726f25ba14d7eae18c1b1a1735a3b7bc630912a4a0ab45d6e961ff0b43a09ed35ed2adca11486df531db93a771bc4d2fa06e SHA512 2337df146265eeba5c1f5216e14d6d487a97493f316e95a671c54765279768b70acd46da7ad4bccff8076b97f999f458de72c7014bc21c6c9ec893b1ca0693c0
-EBUILD hydrogen-9999.ebuild 2077 BLAKE2B d44f7d81977b4b8a755c0aca634bd6c6da2f7199c59f21928efd606bf3c12912fc2f1861e06725e80ee2bd849a6a366c78e039629cd25ef9e7454799f663f893 SHA512 8e8eea2232f41416685151de940dbdf634491ea3c36315816430a75b38a92c2a05fc4f4e12f8d8d4454d50a2ea37c3d88b6f059e0c4c256faff457d04a669f4e
+EBUILD hydrogen-1.1.0.ebuild 2043 BLAKE2B 444e242109efebde38441568ddbf90700677fa39cdc08f9dae8720d78d090082bc37c5b89b2a42de7247d15fc03ba58e65ea2d96c0d727a009b63179c6d9e989 SHA512 baa3a18a44b7d2504a8b05e943b0a88b8365a44aa1adf498aa11d6ee60d7ec2c6a39342bbd15dfdc291af8b789c50bc22ccc4a7d9b671c109d59ee31c55921ba
+EBUILD hydrogen-9999.ebuild 2050 BLAKE2B 6196b99a92cf45e3b4af44f5015e19c1727af83062362332459dd0b207baea81822e7ceab88942b37a76bd8f8ecedc5291cb666a2c753a9bee430b7d3f43f792 SHA512 c0c2426def5cdbdef507d724f6c22d79da050064d96ec70add7b1b9554c6325eedfaa0817f6dc49d44308d964693546921bcfcf0df6231da8b9dc85978f3d118
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.1.0-gnuinstalldirs.patch
index ef70497abf72..ef70497abf72 100644
--- a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
+++ b/media-sound/hydrogen/files/hydrogen-1.1.0-gnuinstalldirs.patch
diff --git a/media-sound/hydrogen/hydrogen-1.1.0.ebuild b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
new file mode 100644
index 000000000000..85706a8f385c
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 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}"
+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_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/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 8a3c0ad28c9a..6d861d99ffa9 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -57,7 +57,7 @@ RDEPEND="${CDEPEND}"
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
 PATCHES=(
-	"${FILESDIR}/${P}-gnuinstalldirs.patch"
+	"${FILESDIR}/${PN}-1.1.0-gnuinstalldirs.patch"
 )
 
 src_prepare() {
@@ -70,7 +70,6 @@ src_configure() {
 		-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)
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 3d4746deb1f0..3c542c016587 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
 DIST lollypop-1.2.35.tar.xz 509916 BLAKE2B 8cf9ea74287b6ac7d4942c2312cc4d6e07d4748d505cc9e45a896129f9e4a43ef5c65c0c18764597d7ce3c4d2fc93804c501f68ea3b67625e200497613077af6 SHA512 179fa5e77482db35de9e30e392e6d07bb5c832d5d1decaee06982570bdcbb809dc99375eeb6fe3dce75829af3570953ce517e3b4eaabceac807b9d5c382bd53e
 DIST lollypop-1.4.18.tar.xz 575120 BLAKE2B 62ff404c0e7c2ac7029ebb45143db35b0b93b30bfc386fb08aa4a2fc10916efb190118f41e40a0f795bef4f8d0b21b0353b9e27bbb75c5471132145028fc8b27 SHA512 17f2db91a56fd140c66c251732eca4b2a6cc1849b5dc72f0a4014c766c64eee475bc9d2305d307e2a54184ab5dd812a5fb27b39acf60a1c468770d1d34307982
-EBUILD lollypop-1.2.35.ebuild 1486 BLAKE2B c9a720c44c1b8706fb7a6fa54c2c018cec8888edcb70b463b438d3d209bfd63bcf47b2e354cbdaa8ffe1c172b3d57fae674817122dc0e1a75c3a5cdf8e8e0557 SHA512 5643394a7d28e89e95c374675ea3a1807b708d2082f01ebb7f62cd6822e9af4d123e1a79e9d94f2960aa59b04ca01d25560d421729d1cc194d21b1796ba69a38
-EBUILD lollypop-1.4.18.ebuild 1511 BLAKE2B 4c553f05d9f7fe8059b65f890a0e0189baab5a4b27cf9c7d6852773ff1e70273be88d9a28d81d1a174f2589fec6ad0dd645a559d66c93aec940cb1fe27a2859e SHA512 922162352d0e46fc1e9552c2192fd7eeb979d7a094a99adac1c0a507966af2191b0777741421699009ac6e67a09ca41f0250bc3bdad8fbdf5f1629b121bfcb70
+EBUILD lollypop-1.2.35.ebuild 1485 BLAKE2B b2259b9ad1469a62faa46800ad2bdf9830b4fa28aa46266ab3b13dd99f1e5b48c80d7194bb48f0c6bef833b9c7093ced5f51adcb6898eed293e7a4648906a551 SHA512 04235991552dc76decd9ff1430f30bbc1e99f050fe5e244163a2f1f5b7768ea09d47dec9eec4b5fb6e2f8376bae5b003465b95c23be077acb7381bd45c70d5bc
+EBUILD lollypop-1.4.18.ebuild 1510 BLAKE2B 2517184251761a4d3a64d51f662a3b7623dc18043eb6626329f10da26b8f8ab6ae35cc0d9662d8b5d05c9323bcdc4a4218da5692a16d0fc0b1e80bfec13f7789 SHA512 9c3ff2942f58532a22514c906e481e205aa7dda6ae868130b384c7f11bff606ea8d662ecce6bf8cdcd8a870459ed9a8e4dc6024ab5456f676ad9ef47dcd04122
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.2.35.ebuild b/media-sound/lollypop/lollypop-1.2.35.ebuild
index 33ce3a4d44d7..401c080fe933 100644
--- a/media-sound/lollypop/lollypop-1.2.35.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.35.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 	app-crypt/libsecret[introspection]
 	dev-libs/totem-pl-parser
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/dbus-python
 		dev-python/pillow[${PYTHON_USEDEP}]
 		>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
diff --git a/media-sound/lollypop/lollypop-1.4.18.ebuild b/media-sound/lollypop/lollypop-1.4.18.ebuild
index 4098e58934c5..0f4355032947 100644
--- a/media-sound/lollypop/lollypop-1.4.18.ebuild
+++ b/media-sound/lollypop/lollypop-1.4.18.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 	app-crypt/libsecret[introspection]
 	dev-libs/totem-pl-parser
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/dbus-python
 		dev-python/gst-python[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index a0f51fdb17a7..79e8892d9de2 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,5 +1,7 @@
 DIST mpg123-1.28.1.tar.bz2 1066558 BLAKE2B 4516ed6cafda21aaaf132266b91ae235ca0b911a79c4514c0588c030f4f5f2f3923153729f1fc3354cb5fa982ca8dc27ba6cb58fa884da379a8913c8119e8bd2 SHA512 af1fb96878a7b57f62f06445e9b888cbecc569a91fe118459c71415f62287f9d9de9b0d0663522cb181e1a21692d64d0a810d8aebfa6e085eb76926d7a2186f9
 DIST mpg123-1.28.2.tar.bz2 1065867 BLAKE2B 2fc585598e49334b608c2a8487b40b599dc1a57afc53249975a339dbc381b968cc099d4274fb74872d3c4c54d1a6ee1858c4b00c78feb93809c823cc56398661 SHA512 45ac11c5997d13f80917e135a40d2fb4448703dad56271dfe8ce7c8dea339cbac7727ec121779040bd7a07fc4ea79086860ea4a8ec879eda3bdcbf7d57348cda
+DIST mpg123-1.29.0.tar.bz2 1068523 BLAKE2B f044dcdef62156cc34a4709d6ead71042e936d77a86386563862d54d7b18635dd378d4dcac1358228c8275d7bcef894f17432cac0519373d11d4c5f18e346728 SHA512 4261a086395f118f6723d8a3757ebcf5244359be07af634d8bf802e48524978a0974f8b17b423bbf38d262c82ac9e31e0fd5d07a735f63f5e33f58d82dc5fdaf
 EBUILD mpg123-1.28.1-r1.ebuild 2985 BLAKE2B f8336768a984ea5833a8367c5117634c8cb2df08a26dd15347198ccbc8a6ddb7af7823d2159aad3840a2c0a0f0c38a917ace673985c98bdcede043defde6066a SHA512 349beec6a8e9d9c7a2f4762760da91fc4683d956098cf7bb9b230aab601eeb1754f428fbcb141e2cb66f0c834651ad2b6ca64ceecee9b2200f8f449b6912306f
 EBUILD mpg123-1.28.2-r1.ebuild 2999 BLAKE2B 49a074e953c393d80541c36a02e2ca1340937b4d844650177316b76662a2b4a47c775ff119f32ad0c65605f1daf554c6e46c985bbf83070961064479c9fea15e SHA512 359623d74681fd7401f131d63094219cb2a1e42fa2fa1a27692c48c432e1929809c5b10f9b9a6d3a97983de05ae4410f176368d39e9c269a10eac264d81447ee
+EBUILD mpg123-1.29.0.ebuild 2999 BLAKE2B 49a074e953c393d80541c36a02e2ca1340937b4d844650177316b76662a2b4a47c775ff119f32ad0c65605f1daf554c6e46c985bbf83070961064479c9fea15e SHA512 359623d74681fd7401f131d63094219cb2a1e42fa2fa1a27692c48c432e1929809c5b10f9b9a6d3a97983de05ae4410f176368d39e9c269a10eac264d81447ee
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.29.0.ebuild b/media-sound/mpg123/mpg123-1.29.0.ebuild
new file mode 100644
index 000000000000..29a2b1f3de75
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.29.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+# Note: build system prefers libsdl2 > libsdl. We could in theory add both
+# but it's tricky when it comes to handling switching between them properly.
+# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
+RDEPEND="
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+IDEPEND="app-eselect/eselect-mpg123"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+
+	if $(multilib_is_native_abi) ; then
+		local flag
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use cpu_flags_ppc_altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext
+		# bug #164504
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=(
+		--with-optimization=0
+		--with-audio="${_audio}"
+		--with-default-audio=${_output}
+		--with-cpu=${_cpu}
+		--enable-network
+		$(use_enable ipv6)
+		--enable-int-quality=$(usex int-quality)
+	)
+
+	multilib_is_native_abi || myconf+=( --disable-modules )
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index 774c6e8a8353..35c68044db08 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.10+release.autotools.tar.gz 1475967 BLAKE2B 86115750bf574717bdfa3e54a5d50b682db6300bf61a6fd951eefd908e165749702e3d1d66db532d393c78472699a04230c8c9263cde4171374c388de9f6d1aa SHA512 ea76b6e3a6038046fc72e92203018202a247e4216bc33cc358290c74aba119e81e0c40d0f4f90874dc605d9354f04437b516b11b0ee3d644af7f230851e3f816
-EBUILD openmpt123-0.5.10.ebuild 1712 BLAKE2B 6947d0493edc22ab0714149e02fb4aa1e2717d6d745338f9a7fd5cb8052885f0352c6513c36a3c68079cf262d3583ef19459725f121ee4a4caf813091818b207 SHA512 0e0520077ad9f27ad5a6ed52961477dfe6346155d79ae038bec18182144390ced977d505edd7a1d774ae937e40e555d03d8b022202f3db18389173f9d669e9fb
+DIST libopenmpt-0.5.11+release.autotools.tar.gz 1477946 BLAKE2B 8fed41af7e5fe1d822716eaa51912e7c5f7d3cd7bef2dbf2266f5e474c4d6300b988636d08bc750602beb831fbf25e532ec137311c84a150806164edc7b5fe30 SHA512 29e19ef2add316fd824f82095db9e81a9a60c07f0b6a54a224c0416452d566c4376e688c5e1b1556461e0f5a1b1543ff45d1388d611d010a646efb8bf1ba733e
+EBUILD openmpt123-0.5.11.ebuild 1712 BLAKE2B 6947d0493edc22ab0714149e02fb4aa1e2717d6d745338f9a7fd5cb8052885f0352c6513c36a3c68079cf262d3583ef19459725f121ee4a4caf813091818b207 SHA512 0e0520077ad9f27ad5a6ed52961477dfe6346155d79ae038bec18182144390ced977d505edd7a1d774ae937e40e555d03d8b022202f3db18389173f9d669e9fb
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-sound/openmpt123/openmpt123-0.5.10.ebuild b/media-sound/openmpt123/openmpt123-0.5.11.ebuild
index 386c068f1a59..386c068f1a59 100644
--- a/media-sound/openmpt123/openmpt123-0.5.10.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.5.11.ebuild
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 7d9ce956f88a..a5a35e8184c5 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,5 +1,5 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
-DIST spotify-client_1.1.56.595.g2d2da0de_amd64.deb 134092920 BLAKE2B a1b836a8c7627254203326c6168dd8351d1c0e527a94e26ec96f9437b72196a717e2cc460b4c89da4098d19d5de4c6f7df150b039a32240b9edc978253590d16 SHA512 4a270461d07c339a3fdf49cd0a8728d4fc7300be001a1ba59c74f05bf273b79a61bde6d046c27a6af38dfb6af58963fbd8b8cd7468c91b91e48b0d32b3dcc2b5
+DIST spotify-client_1.1.67.586.gbb5ef64e_amd64.deb 118938508 BLAKE2B 41239d0c67e3f9e1e4ef2b437320307f1cf947e022635b7c3b9103bfe5fe33f0b1465e9384e78cbb4684b0dec2efd974aa2ac4d1a15860907d66be0b04b14246 SHA512 d105eed1f013be2704ad7f0aaeb80ab2f8f19a0cfe69782f32fc95241d2900560996ec17101222365e1ad3b02ff9fa866da3f0709277a5bb40d032f5a58f7062
 EBUILD spotify-1.0.72-r1.ebuild 3208 BLAKE2B dbe0adc8f45c8c83d2a6734b36439ac0ce67b48ea518ae9153a5006c1ef4e923cd768a983495c35bac8d1469d4e7f5b5c26e73284f43ff9d5d84dd23e80c6740 SHA512 8955f11f24a1a50827b2dc9c37e03ac0c24ad8d352cf91598a3d39c65679f54cd3b8660f21e5a8f1347e408ec1fea8e23a962fd7e2c93b64f034d74a9304ae26
-EBUILD spotify-1.1.56.ebuild 3465 BLAKE2B a4ea3b094b9fe077a20464597f3a405055a748669cccd3ae06fa58c3d30f8ef57b951398e1b87bcc26161c8b926f961b1f7bfa3c97a6d0e1e3417598dbbbc022 SHA512 5af2b45f1816174eb8fbbaa7796b6b86acca2e5bc5c82e7ba576d7323300f4290ef8e23e4000c77f354c6742fa7aafb488b0050028c865b8af27701334cecdc0
+EBUILD spotify-1.1.67-r1.ebuild 3441 BLAKE2B 523420d1b4dd8d4d7192d589492a149f2b95eca72fb7f24362e5d3b6919ca8d28747c4d7f55a5b1bfd6e3e3a58c22ce1ac8b844a106686091bfc0ccec9d15f77 SHA512 40f93d1a80ddec16e9da90bad56be60bd9e3d6b3c0395fe8be35ad7de20c58e9caaabd042de4ae2c5a5c5f7b1d1c264c2ee2152265a73c2e79a542fc4ba6d01c
 MISC metadata.xml 632 BLAKE2B 48e631444ca05aa703c62720ca7f04e57095f32dcf134a1d8dfbab5276a71efebe3fa9d4ec211cd7a5b0b261186af61f78ecf3512fbb8c6da77d2b3c4e97038c SHA512 64f9f4f073b9f48436b4ea62a4d3d0cfba3057dddaffa986bdaa3ad56cfacfec21ef59618b06389f71d85ed1255bf639a755134dfea111b24e4cb7719d21dd80
diff --git a/media-sound/spotify/spotify-1.1.56.ebuild b/media-sound/spotify/spotify-1.1.67-r1.ebuild
index 0b02e6e47079..a723919517c8 100644
--- a/media-sound/spotify/spotify-1.1.56.ebuild
+++ b/media-sound/spotify/spotify-1.1.67-r1.ebuild
@@ -7,7 +7,7 @@ inherit desktop pax-utils unpacker xdg
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/download/linux/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="595.g2d2da0de"
+BUILD_ID_AMD64="586.gbb5ef64e"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
@@ -19,7 +19,6 @@ BDEPEND=">=dev-util/patchelf-0.10"
 RDEPEND="
 	dev-libs/nss
 	dev-python/dbus-python
-	dev-python/pygobject:3
 	libnotify? ( x11-libs/libnotify )
 	dev-libs/openssl:0=
 	media-libs/alsa-lib
@@ -32,7 +31,7 @@ RDEPEND="
 	!pulseaudio? ( media-sound/apulse )
 	local-playback? ( media-video/ffmpeg:0/56.58.58 )
 	systray? ( gnome-extra/gnome-integration-spotify )
-	x11-libs/gtk+:2
+	x11-libs/gtk+:3
 	app-accessibility/at-spi2-atk
 	x11-libs/libxkbcommon
 	x11-libs/libXScrnSaver
diff --git a/media-sound/toolame/Manifest b/media-sound/toolame/Manifest
index 7d0a7e10fe8c..e7592b768038 100644
--- a/media-sound/toolame/Manifest
+++ b/media-sound/toolame/Manifest
@@ -3,5 +3,5 @@ AUX toolame-02l-fno-common.patch 389 BLAKE2B 2dc0b94bb4fcd1b7692d6922dd62b7a4353
 AUX toolame-02l-uint.patch 950 BLAKE2B 6f689e4ff7eb5aa8b6f9f5603813882e2a2fe80b4b37b2a88876b770f6d25c40437b378c7a5df03a57e2f49ba9f7460e7268c90af33a878104edff26be14c2b9 SHA512 ef81fd06b5371ab9fa16037a3cb06ae4dbc9cf7f74c2c1553a06d40a9974ee509ec4f63f6dd5c7b21edb6763c5ea8e43273e98699c73013df430d7e008049f1d
 AUX toolame-02l-uint32_t.patch 624 BLAKE2B 9a07c69bc91f4a90c6169d5c820ceda37dcbad90cb964025c786e8b8d4081434f76f8d0fdf2532abba6ab0a88ee07e07266a9fb0eab8617a0f76bc3c753566aa SHA512 cfde68fe55830f97caf38defc186aa6e95ee3c513e22af4aa06c89e1e071d2caadf22479e260c631442647c43b733aa13bedfca885f68cccf1187fad8aeccb05
 DIST toolame-02l.tgz 127493 BLAKE2B eaa20e1bdc966003401b6fe720bcb6d81aa1c9bf3f8a7aa4f05732ca3c43a71cc55f979a65536197e236e536ada445cfb0c31e3296307100f6d43f64cfb5d16a SHA512 b88c524e1ad65ef30cfcffb53ab0d3552c916714dbde447d714e90ddf048e481d3b1a33f64081c4accc64a776b009d2737c7ab0863695652f2b0743f44a8055e
-EBUILD toolame-02l-r4.ebuild 675 BLAKE2B ea73660b31d79d796c984a1fd1f102aa5774657770add015ce53629fa38700f81aec2a9bc7045e823cae58aab094668c89d23121d50f6241f7f6912c87dc18d0 SHA512 aaa9139eb12498f0ba47eea3a840519d496851f075524e75da39e9af5540bc32eada5f86f20a7715c74e1d27c3ba37ae47ef98fad8298b2764fec352bdb0ac0d
+EBUILD toolame-02l-r4.ebuild 682 BLAKE2B 5802aabff25ae0ebe2697977175a217d2fd2a1cc05dce5cba702da80aee3e3be8b4afbdea8e11a17e9617792aac169f56e0cda9d62aa15040ba27316e5edc938 SHA512 deb29c9ab552ee7333d7a4011a9d80d3ebae1d1120f71d21aa1144e004aa79e59ff100cca6e55bd3777c5fc6117fbf2df021895a8208e7159ec0ba777b895df8
 MISC metadata.xml 330 BLAKE2B 632691c8ef2f3340e3d9f7e55ee85d64d73aed0286c654e60b3abf674fe79231b85b7d606f36d6c799fb2206ba1074eb1b15960c72124b2d589fe471eb793976 SHA512 e4b6308fa4241c592a768a0a21629e0b0de427c39c8d0ef9c26e093e029de51e55a28ae547b93a584c373a1f29034069198cff2667d647238e20bd4b4f7b8b2e
diff --git a/media-sound/toolame/toolame-02l-r4.ebuild b/media-sound/toolame/toolame-02l-r4.ebuild
index 45c946562688..f18124de23e0 100644
--- a/media-sound/toolame/toolame-02l-r4.ebuild
+++ b/media-sound/toolame/toolame-02l-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-Makefile.patch