2021-05-14 18:05:33 UTC

22 files changed, 75 insertions, 66 deletions

diff --git a/metadata/md5-cache/app-backup/cdbkup-1.0-r2 b/metadata/md5-cache/app-backup/cdbkup-1.0-r3
index d40c510457fb..fe5c72847220 100644
--- a/metadata/md5-cache/app-backup/cdbkup-1.0-r2
+++ b/metadata/md5-cache/app-backup/cdbkup-1.0-r3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=app-cdr/cdrtools net-misc/openssh virtual/eject
+DEPEND=app-cdr/cdrtools net-misc/openssh sys-apps/util-linux
 DESCRIPTION=performs full/incremental backups of local/remote filesystems onto CD-R(W)s
 EAPI=6
 HOMEPAGE=http://cdbkup.sourceforge.net/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=app-cdr/cdrtools net-misc/openssh virtual/eject !app-misc/cdcat
+RDEPEND=app-cdr/cdrtools net-misc/openssh sys-apps/util-linux !app-misc/cdcat
 SLOT=0
 SRC_URI=mirror://sourceforge/cdbkup/cdbkup-1.0.tar.gz
-_md5_=5ceb7abdb1740d4b47bf7e806fa497d2
+_md5_=3236c5aafc0d05f4f43f6ff7ccdb8e2a
diff --git a/metadata/md5-cache/app-cdr/bashburn-3.1.0-r1 b/metadata/md5-cache/app-cdr/bashburn-3.1.0-r2
index c69d80a255d8..003ae0c8f540 100644
--- a/metadata/md5-cache/app-cdr/bashburn-3.1.0-r1
+++ b/metadata/md5-cache/app-cdr/bashburn-3.1.0-r2
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=http://bashburn.dose.se/ https://gitlab.com/anders.linden/BashBurn
 KEYWORDS=amd64 ppc ~ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=app-cdr/cdrtools app-shells/bash app-cdr/cdrdao app-cdr/dvd+rw-tools media-libs/flac || ( dev-libs/libcdio-paranoia media-sound/cdparanoia ) media-sound/lame || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/normalize media-sound/vorbis-tools virtual/eject
+RDEPEND=app-cdr/cdrtools app-shells/bash app-cdr/cdrdao app-cdr/dvd+rw-tools media-libs/flac || ( dev-libs/libcdio-paranoia media-sound/cdparanoia ) media-sound/lame || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/normalize media-sound/vorbis-tools sys-apps/util-linux
 SLOT=0
 SRC_URI=http://bashburn.dose.se/index.php?s=file_download&id=25 -> BashBurn-3.1.0.tar.gz
-_md5_=cb54aaa637fdba65a5308b33ea739d5e
+_md5_=4747129e82a5febf1f4894c841e32ecc
diff --git a/metadata/md5-cache/app-laptop/pommed-1.39-r1 b/metadata/md5-cache/app-laptop/pommed-1.39-r2
index 09f30a939ae4..4875beaa4f11 100644
--- a/metadata/md5-cache/app-laptop/pommed-1.39-r1
+++ b/metadata/md5-cache/app-laptop/pommed-1.39-r2
@@ -8,8 +8,8 @@ INHERIT=desktop linux-info systemd
 IUSE=gtk X kernel_linux
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib media-libs/audiofile dev-libs/confuse dev-libs/dbus-glib sys-apps/dbus sys-libs/zlib amd64? ( sys-apps/pciutils ) x86? ( sys-apps/pciutils ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXpm ) media-sound/alsa-utils virtual/eject
+RDEPEND=media-libs/alsa-lib media-libs/audiofile dev-libs/confuse dev-libs/dbus-glib sys-apps/dbus sys-libs/zlib amd64? ( sys-apps/pciutils ) x86? ( sys-apps/pciutils ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXpm ) media-sound/alsa-utils sys-apps/util-linux
 SLOT=0
 SRC_URI=http://alioth.debian.org/frs/download.php/3583/pommed-1.39.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=d7bd7cf7d9981156d4a2dd3c155995f9
+_md5_=488a05324ece43941d7b955ac491170e
diff --git a/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1 b/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r2
index 5cd663d70711..b430e60919c2 100644
--- a/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1
+++ b/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config install postinst postrm preinst prepare setup unpack
-DEPEND=media-video/vdr media-libs/gd[png,truetype,jpeg] >=dev-libs/boost-1.32.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-libs/gd[png,truetype,jpeg] media-video/vdr >=dev-libs/boost-1.32.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: burn records on DVD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-burn
@@ -7,9 +7,9 @@ INHERIT=vdr-plugin-2
 IUSE=dvdarchive
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-video/vdr media-libs/gd[png,truetype,jpeg] >=dev-libs/libcdio-0.71 >=media-video/dvdauthor-0.6.14 >=media-video/mjpegtools-1.6.2[png] media-video/transcode media-fonts/corefonts virtual/eject >=app-cdr/dvd+rw-tools-5.21 >=media-video/projectx-0.90.4.00_p32 dvdarchive? ( media-video/vdrtools-genindex ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-libs/gd[png,truetype,jpeg] media-video/vdr dvdarchive? ( media-video/vdrtools-genindex ) >=app-cdr/dvd+rw-tools-5.21 >=dev-libs/libcdio-0.71 media-fonts/corefonts >=media-video/dvdauthor-0.6.14 >=media-video/mjpegtools-1.6.2[png] >=media-video/projectx-0.90.4.00_p32 media-video/transcode sys-apps/util-linux >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1252/vdr-burn-0.2.2.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	unpacker	517f16af48ee3ab88180dd58b5143213	vdr-plugin-2	97da93828a6d0a7bb63d8a301042b0f3
-_md5_=bb18dfc646aa066c1ce797bce9b0bf62
+_md5_=871bf156cbfb94a49ab878421a7fa8f7
diff --git a/metadata/md5-cache/media-plugins/vdr-burn-0.3.0-r1 b/metadata/md5-cache/media-plugins/vdr-burn-0.3.0-r2
index 9c7e1cceebc7..facddaca7649 100644
--- a/metadata/md5-cache/media-plugins/vdr-burn-0.3.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-burn-0.3.0-r2
@@ -7,8 +7,8 @@ INHERIT=vdr-plugin-2
 IUSE=dvdarchive
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-libs/gd[png,truetype,jpeg] media-video/vdr app-cdr/dvd+rw-tools dev-libs/libcdio media-fonts/corefonts media-video/dvdauthor media-video/mjpegtools[png] media-video/projectx media-video/transcode virtual/eject >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-libs/gd[png,truetype,jpeg] media-video/vdr app-cdr/dvd+rw-tools dev-libs/libcdio media-fonts/corefonts media-video/dvdauthor media-video/mjpegtools[png] media-video/projectx media-video/transcode sys-apps/util-linux >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2028/vdr-burn-0.3.0.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	unpacker	517f16af48ee3ab88180dd58b5143213	vdr-plugin-2	97da93828a6d0a7bb63d8a301042b0f3
-_md5_=b4429060128ebee82694c8028120a6db
+_md5_=c8dc44dca734aaf9adca0204a2c35c4a
diff --git a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2-r1 b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2-r2
index 4ac2f41641b4..6df0fde60071 100644
--- a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2-r1
+++ b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2-r2
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.muempf.de/
 INHERIT=vdr-plugin-2
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.4.2 || ( media-video/mplay-sh >=media-video/mplayer-sh-0.8.6-r1 ) virtual/eject >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.4.2 || ( media-video/mplay-sh >=media-video/mplayer-sh-0.8.6-r1 ) sys-apps/util-linux >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.muempf.de/down/vdr-mp3-0.10.2.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	unpacker	517f16af48ee3ab88180dd58b5143213	vdr-plugin-2	97da93828a6d0a7bb63d8a301042b0f3
-_md5_=80b76c7ff56a03192f2ce8c24f0b9d7f
+_md5_=68adbf0a433ddff6f72dfef0b28d4ac1
diff --git a/metadata/md5-cache/media-sound/abcde-2.9.3-r1 b/metadata/md5-cache/media-sound/abcde-2.9.3-r1
deleted file mode 100644
index 09226c9ea9b7..000000000000
--- a/metadata/md5-cache/media-sound/abcde-2.9.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Command line CD encoder
-EAPI=7
-HOMEPAGE=https://abcde.einval.com/
-IUSE=aac aiff cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=media-sound/cd-discid net-misc/wget virtual/eject || ( dev-libs/libcdio-paranoia media-sound/cdparanoia media-sound/dagrab ) aac? ( media-libs/faac || ( media-video/atomicparsley media-video/atomicparsley-wez ) ) aiff? ( media-video/ffmpeg ) cdr? ( app-cdr/cdrtools ) flac? ( media-libs/flac ) id3tag? ( dev-python/eyeD3:0.7 >=media-sound/id3-0.12 media-sound/id3v2 ) lame? ( media-sound/lame ) mac? ( media-sound/apetag media-sound/mac ) musepack? ( media-sound/musepack-tools ) musicbrainz? ( dev-perl/MusicBrainz-DiscID >=dev-perl/WebService-MusicBrainz-1.0.4 virtual/perl-Digest-SHA virtual/perl-Getopt-Long ) normalize? ( >=media-sound/normalize-0.7.4 ) opus? ( media-sound/opus-tools ) replaygain? ( lame? ( media-sound/mp3gain ) vorbis? ( media-sound/vorbisgain ) ) speex? ( media-libs/speex ) vorbis? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack )
-SLOT=0
-SRC_URI=https://abcde.einval.com/download/abcde-2.9.3.tar.gz
-_md5_=63c037edc3369f7eb5b4774125760124
diff --git a/metadata/md5-cache/media-sound/abcde-2.9.3-r2 b/metadata/md5-cache/media-sound/abcde-2.9.3-r2
new file mode 100644
index 000000000000..044d9c50c44a
--- /dev/null
+++ b/metadata/md5-cache/media-sound/abcde-2.9.3-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Command line CD encoder
+EAPI=7
+HOMEPAGE=https://abcde.einval.com/
+IUSE=aac aiff cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=GPL-2
+RDEPEND=media-sound/cd-discid net-misc/wget sys-apps/util-linux || ( dev-libs/libcdio-paranoia media-sound/cdparanoia media-sound/dagrab ) aac? ( media-libs/faac || ( media-video/atomicparsley media-video/atomicparsley-wez ) ) aiff? ( media-video/ffmpeg ) cdr? ( app-cdr/cdrtools ) flac? ( media-libs/flac ) id3tag? ( dev-python/eyeD3:0.7 >=media-sound/id3-0.12 media-sound/id3v2 ) lame? ( media-sound/lame ) mac? ( media-sound/apetag media-sound/mac ) musepack? ( media-sound/musepack-tools ) musicbrainz? ( dev-perl/MusicBrainz-DiscID >=dev-perl/WebService-MusicBrainz-1.0.4 virtual/perl-Digest-SHA virtual/perl-Getopt-Long ) normalize? ( >=media-sound/normalize-0.7.4 ) opus? ( media-sound/opus-tools ) replaygain? ( lame? ( media-sound/mp3gain ) vorbis? ( media-sound/vorbisgain ) ) speex? ( media-libs/speex ) vorbis? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack )
+SLOT=0
+SRC_URI=https://abcde.einval.com/download/abcde-2.9.3.tar.gz
+_md5_=2633da0b431ed21e1e6ed49e763c375f
diff --git a/metadata/md5-cache/media-sound/rip-1.07-r1 b/metadata/md5-cache/media-sound/rip-1.07-r2
index c2a16a6e8c9c..cb9fba4274e5 100644
--- a/metadata/md5-cache/media-sound/rip-1.07-r1
+++ b/metadata/md5-cache/media-sound/rip-1.07-r2
@@ -4,7 +4,7 @@ EAPI=7
 HOMEPAGE=http://rip.sourceforge.net
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=media-sound/cdparanoia virtual/eject dev-lang/perl >=dev-perl/CDDB_get-2.10 >=dev-perl/MP3-Info-0.91 || ( media-sound/vorbis-tools media-sound/lame media-libs/flac media-sound/bladeenc )
+RDEPEND=>=dev-perl/CDDB_get-2.10 >=dev-perl/MP3-Info-0.91 dev-lang/perl media-sound/cdparanoia sys-apps/util-linux || ( media-libs/flac media-sound/bladeenc media-sound/lame media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=http://rip.sourceforge.net/download/rip-1.07.tar.gz
-_md5_=e1308b3c80420ca07fa709490c8b784c
+_md5_=5b181eb320bb00168db5523a87d1cd40
diff --git a/metadata/md5-cache/media-video/oxine-0.7.1-r2 b/metadata/md5-cache/media-video/oxine-0.7.1-r3
index 68bf3b48cfc5..78832ce5df97 100644
--- a/metadata/md5-cache/media-video/oxine-0.7.1-r2
+++ b/metadata/md5-cache/media-video/oxine-0.7.1-r3
@@ -7,8 +7,8 @@ INHERIT=flag-o-matic
 IUSE=curl debug dvb exif joystick jpeg lirc nls png v4l X
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libcdio media-libs/xine-lib[v4l?,X,imagemagick] curl? ( net-misc/curl ) dvb? ( media-libs/xine-lib[v4l] ) joystick? ( media-libs/libjsw ) jpeg? ( media-gfx/imagemagick media-libs/netpbm[jpeg,zlib] media-video/mjpegtools ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl sys-devel/gettext ) png? ( media-gfx/imagemagick media-libs/netpbm[png,zlib] media-video/mjpegtools ) X? ( x11-libs/libXext x11-libs/libX11 ) virtual/eject
+RDEPEND=dev-libs/libcdio media-libs/xine-lib[v4l?,X,imagemagick] curl? ( net-misc/curl ) dvb? ( media-libs/xine-lib[v4l] ) joystick? ( media-libs/libjsw ) jpeg? ( media-gfx/imagemagick media-libs/netpbm[jpeg,zlib] media-video/mjpegtools ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl sys-devel/gettext ) png? ( media-gfx/imagemagick media-libs/netpbm[png,zlib] media-video/mjpegtools ) X? ( x11-libs/libXext x11-libs/libX11 ) sys-apps/util-linux
 SLOT=0
 SRC_URI=mirror://sourceforge/oxine/oxine-0.7.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=d408dc2cf0e733a739e55823aebc0968
+_md5_=182712a7d4a65bedbdf7d3de17c0b7f8
diff --git a/metadata/md5-cache/sys-apps/udevil-0.4.4-r4 b/metadata/md5-cache/sys-apps/udevil-0.4.4-r4
index 6054f80a2254..4c77027b8c4d 100644
--- a/metadata/md5-cache/sys-apps/udevil-0.4.4-r4
+++ b/metadata/md5-cache/sys-apps/udevil-0.4.4-r4
@@ -10,4 +10,4 @@ RDEPEND=acct-group/plugdev >=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util
 SLOT=0
 SRC_URI=https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz -> udevil-0.4.4.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=9f5236f5e3f9d7fbda0f5569ad68f189
+_md5_=244bfaba046520985dac735239d9d558
diff --git a/metadata/md5-cache/sys-fs/bashmount-4.3.2 b/metadata/md5-cache/sys-fs/bashmount-4.3.2-r1
index f263568acb0f..93ffdf0b2e3e 100644
--- a/metadata/md5-cache/sys-fs/bashmount-4.3.2
+++ b/metadata/md5-cache/sys-fs/bashmount-4.3.2-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
-DEPEND=app-shells/bash:* sys-apps/dbus sys-apps/util-linux sys-fs/udisks:2 virtual/eject
+DEPEND=app-shells/bash:* sys-apps/dbus sys-apps/util-linux sys-fs/udisks:2
 DESCRIPTION=Bash script that uses udisks to mount removable devices without GUI
 EAPI=7
 HOMEPAGE=https://github.com/jamielinux/bashmount
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-shells/bash:* sys-apps/dbus sys-apps/util-linux sys-fs/udisks:2 virtual/eject
+RDEPEND=app-shells/bash:* sys-apps/dbus sys-apps/util-linux sys-fs/udisks:2
 SLOT=0
 SRC_URI=https://github.com/jamielinux/bashmount/archive/4.3.2.tar.gz -> bashmount-4.3.2.tar.gz
-_md5_=a736c920e362d529742dde5612473673
+_md5_=99c5420eaad62775dee5b4a01be09ebf
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.1 b/metadata/md5-cache/sys-fs/udisks-2.9.1-r1
index b245c1ef983c..d40486288243 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.9.1
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.1-r1
@@ -8,9 +8,9 @@ INHERIT=bash-completion-r1 linux-info systemd udev xdg-utils
 IUSE=acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram kernel_linux
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.24[kbd] ) >=sys-block/parted-3 virtual/eject daemon? ( >=sys-apps/util-linux-2.30 ) selinux? ( sec-policy/selinux-devicekit )
+RDEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.24[kbd] ) >=sys-block/parted-3 >=sys-apps/util-linux-2.30 selinux? ( sec-policy/selinux-devicekit )
 REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.1/udisks-2.9.1.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8e6513d62e8fa8487e5448ac77604d7
+_md5_=db1c00bbe566a5bc6848702ea77628e7
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.2 b/metadata/md5-cache/sys-fs/udisks-2.9.2-r1
index 5f193783e6be..b5fdc471c178 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.9.2
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.2-r1
@@ -8,9 +8,9 @@ INHERIT=bash-completion-r1 linux-info systemd udev xdg-utils
 IUSE=acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.25[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.25[kbd] ) >=sys-block/parted-3 virtual/eject daemon? ( >=sys-apps/util-linux-2.30 ) selinux? ( sec-policy/selinux-devicekit )
+RDEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.25[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.25[kbd] ) >=sys-block/parted-3 >=sys-apps/util-linux-2.30 selinux? ( sec-policy/selinux-devicekit )
 REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.2/udisks-2.9.2.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b013e9fc9ed36a3accd5edf6471c062e
+_md5_=cf9e1b4502bfbac693595a3f397b9574
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.119 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.119
new file mode 100644
index 000000000000..bc7e65959a5b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.119
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.119
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-122.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-122.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-122.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-122.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-122.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-122.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-122.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-122.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-122.experimental.tar.xz )
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	estack	055c42df72f76a4f45ec92b35e83cd56	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	kernel-2	5354799dd98f51be880d4f658e1bf57b
+_md5_=9c321ea49c7b6536df2d87bfdc72f242
diff --git a/metadata/md5-cache/virtual/eject-0-r1 b/metadata/md5-cache/virtual/eject-0-r1
deleted file mode 100644
index b9e6e4df1395..000000000000
--- a/metadata/md5-cache/virtual/eject-0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for the eject command
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-RDEPEND=|| ( >=sys-apps/util-linux-2.22 sys-block/eject-bsd )
-SLOT=0
-_md5_=282b216fe246f4e0ddda0dca739ccd16
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-1.3.2 b/metadata/md5-cache/x11-misc/pcmanfm-1.3.2
deleted file mode 100644
index 6b2e7125f9a4..000000000000
--- a/metadata/md5-cache/x11-misc/pcmanfm-1.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk >=dev-libs/glib-2.18:2 >=lxde-base/menu-cache-1.1.0-r1 virtual/eject virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libfm-1.3.2:=[gtk] x11-libs/libX11 x11-libs/pango x11-misc/shared-mime-info dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Fast lightweight tabbed filemanager
-EAPI=7
-HOMEPAGE=https://wiki.lxde.org/en/PCManFM
-IUSE=debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk >=dev-libs/glib-2.18:2 >=lxde-base/menu-cache-1.1.0-r1 virtual/eject virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libfm-1.3.2:=[gtk] x11-libs/libX11 x11-libs/pango x11-misc/shared-mime-info
-SLOT=0
-SRC_URI=mirror://sourceforge/pcmanfm/pcmanfm-1.3.2.tar.xz
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5148c64c57db27dc1f3a262da44b6f64
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-1.3.2-r1 b/metadata/md5-cache/x11-misc/pcmanfm-1.3.2-r1
new file mode 100644
index 000000000000..f81924fb358e
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/pcmanfm-1.3.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk >=dev-libs/glib-2.18:2 >=lxde-base/menu-cache-1.1.0-r1 sys-apps/util-linux virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libfm-1.3.2:=[gtk] x11-libs/libX11 x11-libs/pango x11-misc/shared-mime-info dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Fast lightweight tabbed filemanager
+EAPI=7
+HOMEPAGE=https://wiki.lxde.org/en/PCManFM
+INHERIT=xdg readme.gentoo-r1
+IUSE=debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.18:2 >=lxde-base/menu-cache-1.1.0-r1 sys-apps/util-linux virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libfm-1.3.2:=[gtk] x11-libs/libX11 x11-libs/pango x11-misc/shared-mime-info
+SLOT=0
+SRC_URI=mirror://sourceforge/pcmanfm/pcmanfm-1.3.2.tar.xz
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=d0ed55e5a0f2f3150f9a0d3e61871cb5
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0-r1
index 7618606ae579..9de191654bb1 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0-r1
@@ -1,14 +1,14 @@
 BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.8.0 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.16* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme
+DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/util-linux =x11-libs/libfm-qt-0.16* x11-libs/libxcb:= x11-misc/xdg-utils virtual/freedesktop-icon-theme
 DESCRIPTION=Qt GUI Tabbed Filemanager
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
 INHERIT=cmake optfeature xdg-utils
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2 GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.16* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme !lxqt-base/lxqt-l10n
+RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/util-linux =x11-libs/libfm-qt-0.16* x11-libs/libxcb:= x11-misc/xdg-utils virtual/freedesktop-icon-theme !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/pcmanfm-qt/releases/download/0.16.0/pcmanfm-qt-0.16.0.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	optfeature	e142388219c7fee6ff016fe1c78a10a5
-_md5_=9a5c463d3479d0b3f7121e20cf4971fd
+_md5_=49b7cbf7522a3afc150d2b75ae7cd4f2
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.17.0 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.17.0-r1
index 15b55a285f67..ad0ab17b011c 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.17.0
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.17.0-r1
@@ -1,14 +1,14 @@
 BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.9.0 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.17* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme
+DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/util-linux =x11-libs/libfm-qt-0.17* x11-libs/libxcb:= x11-misc/xdg-utils virtual/freedesktop-icon-theme
 DESCRIPTION=Qt GUI Tabbed Filemanager
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
 INHERIT=cmake optfeature xdg-utils
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2 GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.17* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme >=lxde-base/lxmenu-data-0.1.5
+RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/util-linux =x11-libs/libfm-qt-0.17* x11-libs/libxcb:= x11-misc/xdg-utils virtual/freedesktop-icon-theme >=lxde-base/lxmenu-data-0.1.5
 SLOT=0
 SRC_URI=https://github.com/lxqt/pcmanfm-qt/releases/download/0.17.0/pcmanfm-qt-0.17.0.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	optfeature	e142388219c7fee6ff016fe1c78a10a5
-_md5_=89527e7492901045fe4a655a2639a12e
+_md5_=577865b22bc0fc93d650b2722ab5fdcf
diff --git a/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1 b/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
index e2b361edef72..86e631449a9a 100644
--- a/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
+++ b/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils virtual/udev virtual/freedes
 SLOT=0
 SRC_URI=https://github.com/IgnorantGuru/spacefm/archive/1.0.6.tar.gz -> spacefm-1.0.6.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	optfeature	e142388219c7fee6ff016fe1c78a10a5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=830a12f77428e19e1d145c29f55f3f9b
+_md5_=ecd3ebc43b87e990a42fa0297e125e1f
diff --git a/metadata/md5-cache/x11-misc/spacefm-9999 b/metadata/md5-cache/x11-misc/spacefm-9999
index 00088b0f3134..dda13fbd987e 100644
--- a/metadata/md5-cache/x11-misc/spacefm-9999
+++ b/metadata/md5-cache/x11-misc/spacefm-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils virtual/udev virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	optfeature	e142388219c7fee6ff016fe1c78a10a5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=830a12f77428e19e1d145c29f55f3f9b
+_md5_=ecd3ebc43b87e990a42fa0297e125e1f