diff --git a/Manifest.files.gz b/Manifest.files.gz
index 4824b1edaba2..3117feb3b4af 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 0fc505cddac3..59f6e325dd86 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index d6fe61b5ce66..578dc04853e8 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -3,3 +3,4 @@ DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 6fcdc184900cd30e42b3e1b6f56bcccbf1
 DIST mysql-workbench-community-8.0.23-src.tar.gz 20719770 BLAKE2B 4e1e44428a9e8a00c23f8f9f6e1519f8d13c205fac110168da67fb462d2a13204d41f1d0e109a3dde8ad2dbd3de31fee09ae4ccea97f9de04d0bc4fb2fad180e SHA512 f50d71bd196d5e5446cd14a228e52c4e74506cc2dd95d1601cc5e99b00db0d82dbcb28fd2ed404ee77ca63c6854d47c46773938e09ab601c10009c0ca99e4d54
 DIST mysql-workbench-community-8.0.24-src.tar.gz 19105744 BLAKE2B bc38f18344ba606d29317e5706b6dcd71a29785a3d94d717c21a591c488182595026bb15e1785e57bd56d74b4eb85c87beb5d386dc050ffe2cb2bd4bb7e665bd SHA512 61dd41cd410cde5da4e43e0fcd9e25fdf4b67b831bb40d8facc9450e9bc9446844f397748875a21a839d2612c64d8f8f05eaae21e9a73e419bfa9e14a8fb19e8
 DIST mysql-workbench-community-8.0.25-src.tar.gz 19107324 BLAKE2B aff77a7c216f470d78d3b9f33cc51c70a7b1210c40634c1af75e954ab092efd4d0865afb7869ff52f82434243ed0e2a4ddd48cf55902c9533a32ed2cc183bb33 SHA512 b75e82756a91b9f96d8c0eeece1ef8e8f3a7a1dbe8911d2045b9347fb912215ee0a7dd3ef6d827b78fe748aa9e5ecfaa858d2d3dc08233726c706712f3eac3f1
+DIST mysql-workbench-community-8.0.26-src.tar.gz 19282576 BLAKE2B 4b05d42a10ad3cc88d6447ff5ed1344ac8ef75564e2b69a55f603930f3ff75cd9ac00fd82b6b7339bdbf9524a593fadc32070c6cb5f77e9eeb6ad8e24cc59e7c SHA512 33b28b74b5c7d75c7b3c017cdebc48f3453d0aed2e8ebb20052e462479d0147e164d409e040ab8d1828c2209ad3bc41ab9684e91f86769bf7c1fa0ee117e888c
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild
new file mode 100644
index 000000000000..a565f9ac9900
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.26.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.9.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/"
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+	https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+		app-crypt/libsecret
+		dev-libs/glib:2
+		dev-cpp/antlr-cpp:4
+		dev-cpp/atkmm:*
+		dev-cpp/pangomm:1.4
+		>=dev-cpp/glibmm-2.14:2
+		dev-cpp/gtkmm:3.0
+		dev-libs/atk
+		>=net-libs/libssh-0.8.5[server]
+		x11-libs/pango
+		x11-libs/gtk+:3
+		gnome-base/libglade:2.0
+		>=x11-libs/cairo-1.5.12[glib,svg]
+		>=dev-libs/rapidjson-1.1.0
+		dev-libs/libsigc++:2
+		>=dev-libs/boost-1.55.0[nls]
+		>=dev-cpp/ctemplate-0.95
+		>=dev-libs/libxml2-2.6.2:2
+		dev-libs/libzip
+		dev-libs/libpcre[cxx]
+		>=sci-libs/gdal-1.11.1-r1
+		virtual/opengl
+		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+		dev-libs/tinyxml[stl]
+		>=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1*
+		dev-db/vsqlite++
+		|| ( dev-db/libiodbc dev-db/unixODBC )
+		dev-python/pexpect
+		>=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+		app-admin/sudo
+		>=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+		dev-lang/swig
+		virtual/jre
+		virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+	"${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+	unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+	## remove hardcoded CXXFLAGS
+	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+	## And avoid -Werror
+	sed -i -e 's/-Werror//' CMakeLists.txt || die
+	## Fix doc install directory
+	sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; /WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
+
+	## package is very fragile...
+	strip-flags
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	if has_version dev-db/libiodbc ; then
+		IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
+	fi
+
+	append-cxxflags -std=c++11
+	ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
+	local mycmakeargs=(
+		-DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+		-DIODBC_INCLUDE_PATH="/usr/include/iodbc"
+		${IODBC}
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
+	)
+	cmake_src_configure
+}
diff --git a/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild
index 92b83232fe06..8cb21b3ed999 100644
--- a/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 4c53925d7c20..416a96b8524d 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 2584a63aafb4..41d817a78359 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -1,3 +1,4 @@
 DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610dd9deb3409c8ad270f7221d50e9eefee826c16c51ac0361cf7f5da727db216b1bd92a02077b0bee580fa368c SHA512 4676d030a3e676249a221cf4a136ce69651009ce5855821924be184460e404e4f33026627c9d524156a89344c826b48a690a249f1059493d7d214b922381bdd0
 DIST listen-3.3.3.tar.gz 52994 BLAKE2B 95831a65a75cae28b767696bbe5969cd7115657fa56e01701f3b17d5bd727a053cbac16928d8c7c2a19ad24ea3c99afdadd1e9ebbae0a66d03a511ded7d32734 SHA512 73ad762086e7961e45f1245e5aa32c738824736b7d373c31565832c3acf25f91cbc9c25d7bdffb27cf953cb2b2bb37adfddcc6888f3a1b317f70cba75c2ce67c
 DIST listen-3.5.1.tar.gz 56236 BLAKE2B e74186532d5aa9fa7488d0734867d7ec7218036b10769667b8818d057af4d8a973204ce68f687fa508d5d2ed879b0ba6287c3b93fb05eaedfc63a8dc251523b9 SHA512 d7475e295b5123c5a8f166891e866de60379f28d61ab0610774bdf499bcf0859807ea2abb31fd6e708c106f926282376aec94ce268e6709884a63852e820ae74
+DIST listen-3.6.0.tar.gz 56134 BLAKE2B 6826426c5e46fa10145148d545ebdda278af080c4ddda8b055189a9aec91c26302c991ba69199d2616ae171ac85cb0ec6cef657980e6b984bc09513adabf3d16 SHA512 32b93ee98333657f8dfcaa8e5c9aa291d5413ddfadac3c3ff34edd2a2273e119922dee71825d6b06a6e86951deb96a676a8b9cdd98431fd21c55557a154702ee
diff --git a/dev-ruby/listen/listen-3.6.0.ebuild b/dev-ruby/listen/listen-3.6.0.ebuild
new file mode 100644
index 000000000000..5d10bd2e1352
--- /dev/null
+++ b/dev-ruby/listen/listen-3.6.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index b20baa70a4a9..c5526d23a6e0 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/hexter/Manifest b/media-plugins/hexter/Manifest
index 663e6ff49478..0bf9ffee04a6 100644
--- a/media-plugins/hexter/Manifest
+++ b/media-plugins/hexter/Manifest
@@ -1,2 +1 @@
-DIST hexter-1.1.0.tar.bz2 737430 BLAKE2B 9c79da379a69bc4ceceab11dc725d965bb923384e060e24eb7e7d1f65650d5c77206a79d02403e7a952c2eb3c46262b5905e5b07872fb5b060525ed0f275cbc4 SHA512 8d433fae44b0620c3866c9a3b2445271a039c8ac3ad12c71ca34d667a85b95b9bddd7e04c4eaa2c27299c66b9cce16d104b5fbb376dd3cdc85f7e4d6c9b28529
 DIST hexter-1.1.1.tar.bz2 738789 BLAKE2B c3feb3cbed77ba7b6c7dec9158af60cca0c02c2f3f65eb6a80f0f57593998e3ecf28599736e94e56e5d1daa72b2868a2831b4491eb73bee6302ed78fbe1712fb SHA512 db744ba7c9066f6b47b8e6e31c830fdb1760ee5e8df5a8f287878bc62891d1d1b10a568bc58b00fc732933c9ff1f816e1d88c836741c302bbb4353c96ac291cc
diff --git a/media-plugins/hexter/hexter-1.1.0.ebuild b/media-plugins/hexter/hexter-1.1.0.ebuild
deleted file mode 100644
index c2ad330e29d9..000000000000
--- a/media-plugins/hexter/hexter-1.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Yamaha DX7 modeling DSSI plugin"
-HOMEPAGE="http://smbolton.com/hexter.html"
-SRC_URI="https://github.com/smbolton/${PN}/releases/download/version_${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk2 readline"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	media-libs/alsa-lib
-	>=media-libs/dssi-0.4
-	>=media-libs/liblo-0.12
-	gtk2? ( x11-libs/gtk+:2 )
-	readline? (
-		sys-libs/ncurses:0=
-		sys-libs/readline:0=
-	)
-"
-DEPEND="${RDEPEND}
-	media-libs/ladspa-sdk
-"
-
-src_configure() {
-	PKG_CONFIG=$(tc-getPKG_CONFIG) \
-	econf $(use_with gtk2) \
-		$(use_with readline textui)
-}
diff --git a/media-plugins/hexter/metadata.xml b/media-plugins/hexter/metadata.xml
index c524cb77afce..140af081ec2b 100644
--- a/media-plugins/hexter/metadata.xml
+++ b/media-plugins/hexter/metadata.xml
@@ -5,9 +5,6 @@
     <email>proaudio@gentoo.org</email>
     <name>Gentoo ProAudio Project</name>
   </maintainer>
-  <use>
-    <flag name="gtk2">Enable <pkg>x11-libs/gtk+</pkg>:2 based GUI</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">dssi</remote-id>
   </upstream>
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1b3026eb5552..118e7b1908a2 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index 050a5c1c75f4..ae5ec5bf5625 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,2 +1,3 @@
 DIST gpodder-3.10.16.tar.gz 1058386 BLAKE2B d73bc8a9d9d2cfe642a6c1e7ae3e7811e05db8c1ebf566904e669a5f9d029c6bce73599da737d25f42c4740d23537b1c414e7a23cf15076394fb714a2f33c79c SHA512 ce9525864e5a640dd82fb535021d63e1d1ddeb7785774b00c668ff86a279a45e075ab7488120ec93d1a07a0a943daa0abb786f822d74866e0fd8c6713d7f8531
 DIST gpodder-3.10.20.tar.gz 1081171 BLAKE2B b2a07a3d5ce02cc46d7dd5999287b6e0bb96149f2fbf613b0d70b8d3b04d4cd29dcd1b78b4584709d1613c9a5478d39c3cb9be35a274358d56aa593f0196e6b2 SHA512 93cae9cc6d7f3a7754e24f7e962d195788f5f344992a4a3f3be9fd9acf419728b94ce009e1a2e14faa64803ebba098e8199a8d43ed33f5f3e02eabde1fe5c3be
+DIST gpodder-3.10.21.tar.gz 1105520 BLAKE2B c17905951c14a718e48d1bbded3abc41d62088bb517cda053e9fa71e3a952bb97ac57077d428cd58c3a048ae0cc18ef9385af97dcf8b460f3860674ecdb85c1c SHA512 5311a92469f605e489553e91586b788a8d07812e41c20d1ad0717c09ab6db6da22c356d5c1942293d1e27e25afe24caf3c14c15720250d8f230f2d7738206fec
diff --git a/media-sound/gpodder/gpodder-3.10.21.ebuild b/media-sound/gpodder/gpodder-3.10.21.ebuild
new file mode 100644
index 000000000000..7cff7c80eaa7
--- /dev/null
+++ b/media-sound/gpodder/gpodder-3.10.21.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 optfeature xdg
+
+DESCRIPTION="A free cross-platform podcast aggregator"
+HOMEPAGE="https://gpodder.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbus bluetooth kernel_linux mtp test"
+RESTRICT="!test? ( test )"
+
+# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_USEDEP}] and
+# ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) once they
+# support python3
+COMMON_DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+		>=dev-python/podcastparser-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/mygpoclient-1.8[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	')
+	bluetooth? ( net-wireless/bluez )
+	mtp? ( >=media-libs/libmtp-1.0.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( sys-apps/iproute2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-apps/help2man
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/minimock[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:--cov=gpodder::' makefile || die
+}
+
+src_test() {
+	emake releasetest
+}
+
+src_install() {
+	emake PYTHON=${EPYTHON} DESTDIR="${D}" install
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "for the youtube-dl extension" net-misc/youtube-dl
+}
diff --git a/media-sound/volwheel/Manifest b/media-sound/volwheel/Manifest
index d84d01469205..1958eefc02b3 100644
--- a/media-sound/volwheel/Manifest
+++ b/media-sound/volwheel/Manifest
@@ -1,2 +1 @@
-DIST volwheel-0.2.8.tar.gz 43140 BLAKE2B 87e23aa333485f31b2d21d79825d61aa421283d7ef62fc20e30e21cd11a2c379f5ae536cdba08883ced2a112a4ef0f8de9e719908afdcf5cd94d0431ce92f8b6 SHA512 ee2d121d2a9e2c987407a30187a313db128f1557932d003421e0fbda683cf80d52b5fb3c4c4ab2d07b642e86bb580bb3764a1c091ea57f5068660a035e78721b
 DIST volwheel-0.2.9.tar.gz 43921 BLAKE2B 9f555d8666373127de8a02cb4f83b12a2f6dab4c78087c3cef711fc6c59343d69af2f36e68a9354390bd820aff5ea41405b5cf5eef8d196da010efaf5d878b80 SHA512 9a16a9813953d2acfe7bae25c366094f244f34b6031e8d75761468590e76d63005580c26b0f27f26ac6e6537a179d15fdaa4348d94c84d0bb1fb7ec97e092e5d
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch b/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
deleted file mode 100644
index 11af8697af6a..000000000000
--- a/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/volwheel.desktop
-+++ b/volwheel.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=VolWheel
- GenericName=VolWheel
- Comment=Easy sound volume adjustment
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch b/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
deleted file mode 100644
index 4a801cf5192f..000000000000
--- a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://code.google.com/p/olwtools/issues/detail?id=8
-
---- a/install.pl
-+++ b/install.pl
-@@ -2,7 +2,6 @@
- 
- use strict;
- use warnings;
--use Shell qw(install cp);
- 
- my $package = "volwheel";
- 
-@@ -33,17 +32,17 @@
- 	system("sed -i 's|/usr/local|$prefix|g\' volwheel");
- }
- 
--my $output = install ("-v -d {$bindir,$libdir,$datadir,$hicolor,$desktop}");
-+my $output = qx|install -v -d {$bindir,$libdir,$datadir,$hicolor,$desktop}|;
- print $output;
--$output = install ("-v -m755 volwheel $bindir");
-+$output = qx|install -v -m755 volwheel $bindir|;
- print $output;
--$output = install ("-v -m644 lib/* $libdir");
-+$output = qx|install -v -m644 lib/* $libdir|;
- print $output;
--$output = cp      ("-v -r icons $datadir/");
-+$output = qx|cp -v -r icons $datadir/|;
- print $output;
--$output = install ("-v -m644 icons/volwheel.svg $hicolor");
-+$output = qx|install -v -m644 icons/volwheel.svg $hicolor|;
- print $output;
--$output = install ("-v -m644 volwheel.desktop $desktop");
-+$output = qx|install -v -m644 volwheel.desktop $desktop|;
- 
- print "\nVolWheel has been succesfully installed.\n\n";
- 
diff --git a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild b/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
deleted file mode 100644
index 49e02ece502f..000000000000
--- a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="A volume control trayicon with mouse wheel support"
-HOMEPAGE="https://oliwer.net/b/volwheel.html"
-SRC_URI="https://olwtools.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="alsa"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Gtk2
-	alsa? ( media-sound/alsa-utils )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-perl516.patch
-	"${FILESDIR}"/${P}-desktop-QA.patch
-)
-
-src_install() {
-	./install.pl prefix="${EPREFIX}"/usr destdir="${D}" || die
-	einstalldocs
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d9c31d65f42d..51c5681569e4 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 33b2694f601e..582a1e7ae64b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Jul 2021 05:08:54 +0000
+Wed, 21 Jul 2021 06:38:54 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 33b2694f601e..582a1e7ae64b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Jul 2021 05:08:54 +0000
+Wed, 21 Jul 2021 06:38:54 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 00ce9bc8c6e3..62ada1133343 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index fe31cb3a8054..12aa23f811d3 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-8.0.26 b/metadata/md5-cache/dev-db/mysql-workbench-8.0.26
new file mode 100644
index 000000000000..6cf68f7642ca
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-workbench-8.0.26
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-crypt/libsecret dev-libs/glib:2 dev-cpp/antlr-cpp:4 dev-cpp/atkmm:* dev-cpp/pangomm:1.4 >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.8.5[server] x11-libs/pango x11-libs/gtk+:3 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 >=dev-libs/boost-1.55.0[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1 virtual/opengl || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1* dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) dev-python/pexpect >=dev-python/paramiko-1.7.4 dev-lang/swig virtual/jre virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=MySQL Workbench
+EAPI=7
+HOMEPAGE=https://www.mysql.com/products/workbench/
+IUSE=debug doc python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-crypt/libsecret dev-libs/glib:2 dev-cpp/antlr-cpp:4 dev-cpp/atkmm:* dev-cpp/pangomm:1.4 >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.8.5[server] x11-libs/pango x11-libs/gtk+:3 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 >=dev-libs/boost-1.55.0[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1 virtual/opengl || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1* dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.26-src.tar.gz https://www.antlr.org/download/antlr-4.9.1-complete.jar
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=37fdedf36ede9418e6c1e82abcda383c
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-5.1.1 b/metadata/md5-cache/dev-db/phpmyadmin-5.1.1
index df998de08d4a..de49a549b758 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-5.1.1
+++ b/metadata/md5-cache/dev-db/phpmyadmin-5.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Web-based administration for MySQL database in PHP
 EAPI=7
 HOMEPAGE=https://www.phpmyadmin.net/
 IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-7.1[ctype,filter,json(+),session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 SLOT=5.1.1
 SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/5.1.1/phpMyAdmin-5.1.1-all-languages.tar.xz
 _eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=61bc01d4d9b7bf66e9904a0e667b1d30
+_md5_=acfd191367d404ec814e627323267f84
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 48226efc4f25..5b5a1829109c 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/listen-3.6.0 b/metadata/md5-cache/dev-ruby/listen-3.6.0
new file mode 100644
index 000000000000..ad6155f75e11
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/listen-3.6.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/thor[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/thor[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/thor[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Listens to file modifications and notifies you about the changes
+EAPI=8
+HOMEPAGE=https://github.com/guard/listen
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/guard/listen/archive/v3.6.0.tar.gz -> listen-3.6.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3a7c928e6e73b500c0f2e131b11e0a33
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 971e315bd133..825bfa726cdc 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/hexter-1.1.0 b/metadata/md5-cache/media-plugins/hexter-1.1.0
deleted file mode 100644
index 6858aef74891..000000000000
--- a/metadata/md5-cache/media-plugins/hexter-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure
-DEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? ( x11-libs/gtk+:2 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) media-libs/ladspa-sdk
-DESCRIPTION=Yamaha DX7 modeling DSSI plugin
-EAPI=7
-HOMEPAGE=http://smbolton.com/hexter.html
-IUSE=gtk2 readline
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? ( x11-libs/gtk+:2 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= )
-SLOT=0
-SRC_URI=https://github.com/smbolton/hexter/releases/download/version_1.1.0/hexter-1.1.0.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=30fcf4c979af504b19742f3e54c78c8e
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a033228b985b..56e2fc56a1dc 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/gpodder-3.10.21 b/metadata/md5-cache/media-sound/gpodder-3.10.21
new file mode 100644
index 000000000000..857fce77caa3
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gpodder-3.10.21
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/html5lib[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3.22.0:3[python_targets_python3_8(-)] >=dev-python/podcastparser-0.6.0[python_targets_python3_8(-)] >=dev-python/mygpoclient-1.8[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/html5lib[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] >=dev-python/podcastparser-0.6.0[python_targets_python3_9(-)] >=dev-python/mygpoclient-1.8[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) bluetooth? ( net-wireless/bluez ) mtp? ( >=media-libs/libmtp-1.0.0:= ) dev-util/desktop-file-utils dev-util/intltool sys-apps/help2man test? ( python_single_target_python3_8? ( dev-python/minimock[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] dev-python/pytest-localserver[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/minimock[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-localserver[python_targets_python3_9(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A free cross-platform podcast aggregator
+EAPI=7
+HOMEPAGE=https://gpodder.github.io/
+IUSE=+dbus bluetooth kernel_linux mtp test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( dev-python/html5lib[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3.22.0:3[python_targets_python3_8(-)] >=dev-python/podcastparser-0.6.0[python_targets_python3_8(-)] >=dev-python/mygpoclient-1.8[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/html5lib[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] >=dev-python/podcastparser-0.6.0[python_targets_python3_9(-)] >=dev-python/mygpoclient-1.8[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) bluetooth? ( net-wireless/bluez ) mtp? ( >=media-libs/libmtp-1.0.0:= ) kernel_linux? ( sys-apps/iproute2 ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gpodder/gpodder/archive/3.10.21.tar.gz -> gpodder-3.10.21.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7cefa96b7bb89c656858564708801825
diff --git a/metadata/md5-cache/media-sound/volwheel-0.2.8-r1 b/metadata/md5-cache/media-sound/volwheel-0.2.8-r1
deleted file mode 100644
index 992dafb68b3b..000000000000
--- a/metadata/md5-cache/media-sound/volwheel-0.2.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-lang/perl dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A volume control trayicon with mouse wheel support
-EAPI=7
-HOMEPAGE=https://oliwer.net/b/volwheel.html
-IUSE=alsa
-KEYWORDS=amd64 ~mips x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl dev-perl/Gtk2 alsa? ( media-sound/alsa-utils )
-SLOT=0
-SRC_URI=https://olwtools.googlecode.com/files/volwheel-0.2.8.tar.gz
-_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=05b0fec35a5d45cb957ec76a2e35f469
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 9b0c60b4e26d..2e1d39894b5d 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-91.0.4472.164 b/metadata/md5-cache/www-client/chromium-91.0.4472.164
index 89e2d07c077a..83b1cd860b93 100644
--- a/metadata/md5-cache/www-client/chromium-91.0.4472.164
+++ b/metadata/md5-cache/www-client/chromium-91.0.4472.164
@@ -5,11 +5,11 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=7
 HOMEPAGE=https://chromium.org/
 IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
 REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-91.0.4472.164.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-91-patchset-6/chromium-91-patchset-6.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz ) ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/chromium-91-ppc64le-6.tar.xz )
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c50de3dc5af1718a36ea43b3ea0ddda6
+_md5_=c3a998d97a5848eb18d6abb9d676271a
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index d87803a35f9f..0954e281c865 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
index 70fbe747a137..fc4a219613a7 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
@@ -5,10 +5,10 @@ DESCRIPTION=Generic Linux input driver
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev
 IUSE=kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev virtual/libudev:= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=65c1ce9ca6cc409c0cdba2599c463538
+_md5_=d51cf5c0b12c4a9be4b86f2e35697477
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0-r1 b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0-r1
index a5a5939d55b0..0dc837685a5a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0-r1
@@ -4,10 +4,10 @@ DEPEND=x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
 DESCRIPTION=video driver for framebuffer device
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto x11-base/xorg-server x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=4f99888ca664c06432a1fb0201ae621a
+_md5_=339f431b73c34271cc2e6b8aa9976714
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.17 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.17
index 04563c330289..a878492f6a44 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.17
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.17
@@ -4,10 +4,10 @@ DEPEND=>=x11-libs/libdrm-2.4.60[video_cards_nouveau] >=x11-libs/libpciaccess-0.1
 DESCRIPTION=Accelerated Open Source driver for nVidia cards
 EAPI=7
 HOMEPAGE=https://nouveau.freedesktop.org/wiki/ https://cgit.freedesktop.org/nouveau/xf86-video-nouveau
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.60[video_cards_nouveau] >=x11-libs/libpciaccess-0.10 virtual/libudev:= x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=4373c687559351aff82d9a6824edf98a
+_md5_=60df6fdd8dc042adfb071a7031b5e78a
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 33b2694f601e..582a1e7ae64b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Jul 2021 05:08:54 +0000
+Wed, 21 Jul 2021 06:38:54 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 5481cb9875ea..513f95e8493e 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jul 21 05:08:54 AM UTC 2021
+Wed Jul 21 06:38:54 AM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7815ad54ead9..0072b19473d3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Jul 2021 05:30:01 +0000
+Wed, 21 Jul 2021 07:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 05761af6de93..2a146d2e4a8b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-94a5a604c1f59300f43a733a053e248270ad2e5b 1626843264 2021-07-21T04:54:24+00:00
+c6b8c45ca17593b4ceee6e4b1ffd3e263bb4bd6c 1626847895 2021-07-21T06:11:35+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index fb4e5981e00c..07409bfc9071 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1626843901 Wed 21 Jul 2021 05:05:01 AM UTC
+1626849301 Wed 21 Jul 2021 06:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 33b2694f601e..582a1e7ae64b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Jul 2021 05:08:54 +0000
+Wed, 21 Jul 2021 06:38:54 +0000
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 700bc4c70c3d..a17765989791 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/riscv/package.use b/profiles/arch/riscv/package.use
new file mode 100644
index 000000000000..85361e21001c
--- /dev/null
+++ b/profiles/arch/riscv/package.use
@@ -0,0 +1,5 @@
+# Yixun Lan <dlan@gentoo.org> (2021-07-20)
+# Enable the GPU targets matching the default VIDEO_CARDS
+dev-ml/llvm-ocaml llvm_targets_AMDGPU
+sys-devel/clang llvm_targets_AMDGPU
+sys-devel/llvm llvm_targets_AMDGPU
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index 0e90902ae690..abc85c370027 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -54,7 +54,6 @@ ayatana
 
 video_cards_ast
 video_cards_dummy
-video_cards_fbdev
 video_cards_freedreno
 video_cards_geode
 video_cards_glint
@@ -62,7 +61,6 @@ video_cards_i915
 video_cards_i965
 video_cards_intel
 video_cards_mga
-video_cards_nouveau
 video_cards_nv
 video_cards_omap
 video_cards_qxl
@@ -80,7 +78,6 @@ video_cards_nvidia
 # input devices
 
 input_devices_elographics
-input_devices_evdev
 input_devices_joystick
 input_devices_vmmouse
 input_devices_void
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 68d49033d662..6b452b5b8712 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4412,7 +4412,6 @@ media-plugins/gst-plugins-meta:vpx - Enables vp8 codec support using libvpx, req
 media-plugins/gst-plugins-vaapi:drm - Enable DRM renderer
 media-plugins/gst-plugins-vaapi:egl - Enable EGL support
 media-plugins/gst-plugins-vaapi:gles2 - Enable GLESv2 and GLESv3 support
-media-plugins/hexter:gtk2 - Enable x11-libs/gtk+:2 based GUI
 media-plugins/imlib2_loaders:eet - Enable Eet image loader
 media-plugins/imlib2_loaders:xcf - Enable XCF image loader
 media-plugins/ir_lv2:tools - Build convert4chan tool
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 09dde30c68a6..7906515828c9 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/chromium-91.0.4472.164.ebuild b/www-client/chromium/chromium-91.0.4472.164.ebuild
index cd69cc5880ad..986d0856563e 100644
--- a/www-client/chromium/chromium-91.0.4472.164.ebuild
+++ b/www-client/chromium/chromium-91.0.4472.164.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid )
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 983cd7f46157..254276d5552f 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
index 2bdf150ddc17..b694533616cc 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit linux-info xorg-3
 
 DESCRIPTION="Generic Linux input driver"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=x11-base/xorg-server-1.18[udev]
diff --git a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0-r1.ebuild b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0-r1.ebuild
index 4f78d63d2c5d..9cf55c8ba7fa 100644
--- a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0-r1.ebuild
+++ b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ inherit xorg-3
 
 DESCRIPTION="video driver for framebuffer device"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 DEPEND="x11-base/xorg-proto"
 RDEPEND="${DEPEND}
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
index fa0d7d5a8bd7..af511dafe0b2 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 	https://nouveau.freedesktop.org/wiki/
 	https://cgit.freedesktop.org/nouveau/xf86-video-nouveau"
 
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
 
 RDEPEND=">=x11-libs/libdrm-2.4.60[video_cards_nouveau]
 	>=x11-libs/libpciaccess-0.10