gentoo resync : 12.03.2021

44 files changed, 139 insertions, 282 deletions

diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index daff59b77f1a..05b2a08d6ceb 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.38.0 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.38.0
index 628278bd0584..9b0ff8dd961e 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.38.0
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.38.0
@@ -5,11 +5,11 @@ DESCRIPTION=GNOME default icon theme
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/adwaita-icon-theme/
 IUSE=branding
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-BY-SA-4.0 )
 RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=gnome-base/librsvg-2.48:2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c20f21124fdaea67bfb6ff7f95c5761
+_md5_=cc3b7469e925e93317b3b80fe5cf9b3e
diff --git a/metadata/md5-cache/x11-themes/arc-theme-20210127 b/metadata/md5-cache/x11-themes/arc-theme-20210127
index ac08c3cd83bf..66c7edff0329 100644
--- a/metadata/md5-cache/x11-themes/arc-theme-20210127
+++ b/metadata/md5-cache/x11-themes/arc-theme-20210127
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=gtk2? ( x11-themes/gnome-themes-standard x11-themes/gtk-engines-murrine )
 SLOT=0
 SRC_URI=https://github.com/jnsh/arc-theme/releases/download/20210127/arc-theme-20210127.tar.xz pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/arc-theme-20210127-pngs.tar.xz )
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=90dd7d72d0d31933638553037ebd51b2
diff --git a/metadata/md5-cache/x11-themes/chameleon-xcursors-0.5-r1 b/metadata/md5-cache/x11-themes/chameleon-xcursors-0.5-r1
index 8aed83f0c759..66d40d0d25ec 100644
--- a/metadata/md5-cache/x11-themes/chameleon-xcursors-0.5-r1
+++ b/metadata/md5-cache/x11-themes/chameleon-xcursors-0.5-r1
@@ -1,9 +1,11 @@
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Style neutral scalable cursor theme
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.egregorion.net/2007/03/26/chameleon/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://www.egregorion.net/works/Chameleon-Anthracite-0.5.tar.bz2 http://www.egregorion.net/works/Chameleon-DarkSkyBlue-0.5.tar.bz2 http://www.egregorion.net/works/Chameleon-SkyBlue-0.5.tar.bz2 http://www.egregorion.net/works/Chameleon-Pearl-0.5.tar.bz2 http://www.egregorion.net/works/Chameleon-White-0.5.tar.bz2
-_md5_=bf08567f354c4f4efc359ab9ef524032
+SRC_URI=mirror://gentoo/Chameleon-Anthracite-0.5.tar.bz2 mirror://gentoo/Chameleon-DarkSkyBlue-0.5.tar.bz2 mirror://gentoo/Chameleon-SkyBlue-0.5.tar.bz2 mirror://gentoo/Chameleon-Pearl-0.5.tar.bz2 mirror://gentoo/Chameleon-White-0.5.tar.bz2
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=420ea203b456fc8085ef2b828c5336cb
diff --git a/metadata/md5-cache/x11-themes/claws-mail-themes-20140629 b/metadata/md5-cache/x11-themes/claws-mail-themes-20140629
index 5f8e2f0d0e2e..b505eae1c257 100644
--- a/metadata/md5-cache/x11-themes/claws-mail-themes-20140629
+++ b/metadata/md5-cache/x11-themes/claws-mail-themes-20140629
@@ -1,6 +1,7 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Iconsets for Claws Mail
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.claws-mail.org/
 KEYWORDS=~alpha amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 GPL-3 CC-BY-3.0 CC-BY-SA-2.5 CC-BY-NC-SA-3.0 CC-BY-ND-3.0 MPL-1.1 freedist public-domain all-rights-reserved
@@ -8,4 +9,5 @@ RDEPEND=mail-client/claws-mail
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://www.claws-mail.org/themes/claws-mail-themes-20140629.tar.gz
-_md5_=652be1cb45c9083085b02656bcb414c9
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c7ff14ed94815a0ba0ea0aa273433c82
diff --git a/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031 b/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031
index 9177e200723f..ad8586379a7b 100644
--- a/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031
+++ b/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031
@@ -1,12 +1,12 @@
-DEFINED_PHASES=postinst postrm preinst
-DEPEND=virtual/pkgconfig >=x11-misc/icon-naming-utils-0.8.90
+BDEPEND=virtual/pkgconfig >=x11-misc/icon-naming-utils-0.8.90
+DEFINED_PHASES=postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=SVG icon theme from the Echo Icon project
-EAPI=6
+EAPI=7
 HOMEPAGE=https://fedorahosted.org/echo-icon-theme
 KEYWORDS=~amd64 ~x86
 LICENSE=CC-BY-SA-3.0
-RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/echo-icon-theme-0.3.89.0_pre20081031.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=420f7be075c0393a3b4b7c5022d4b506
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=13e55af26d4fd2045b28ecec2eea84bb
diff --git a/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1 b/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1
deleted file mode 100644
index 73d47e1af695..000000000000
--- a/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DESCRIPTION=A scalable icon theme called Faenza
-EAPI=5
-HOMEPAGE=http://tiheum.deviantart.com/art/Faenza-Icons-173323228
-IUSE=minimal
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-3
-RDEPEND=!minimal? ( x11-themes/adwaita-icon-theme ) x11-themes/hicolor-icon-theme
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/faenza-icon-theme/faenza-icon-theme_1.3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff090980882aa8aa0c74ac6f87f852db
diff --git a/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1-r1 b/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1-r1
new file mode 100644
index 000000000000..c62a7670b4b5
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A scalable icon theme called Faenza
+EAPI=7
+HOMEPAGE=https://tiheum.deviantart.com/art/Faenza-Icons-173323228
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=GPL-3
+RDEPEND=x11-themes/hicolor-icon-theme
+SLOT=0
+SRC_URI=mirror://gentoo/faenza-icon-theme_1.3.1.tar.gz
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=57f20598dad6c043db92bd31ea0ccce8
diff --git a/metadata/md5-cache/x11-themes/fvwm-crystal-3.6.5 b/metadata/md5-cache/x11-themes/fvwm-crystal-3.6.5
index 2aebdac91209..182504663652 100644
--- a/metadata/md5-cache/x11-themes/fvwm-crystal-3.6.5
+++ b/metadata/md5-cache/x11-themes/fvwm-crystal-3.6.5
@@ -9,5 +9,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fvwm-crystal/fvwm-crystal-3.6.5.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c37acfece0f5944d2e629efce2044687
diff --git a/metadata/md5-cache/x11-themes/gargantuan-icon-theme-1.7 b/metadata/md5-cache/x11-themes/gargantuan-icon-theme-1.7
index d919a95fd1c6..d528c83de42a 100644
--- a/metadata/md5-cache/x11-themes/gargantuan-icon-theme-1.7
+++ b/metadata/md5-cache/x11-themes/gargantuan-icon-theme-1.7
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=x11-themes/hicolor-icon-theme
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Gargantuan Icon Theme
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.gnome-look.org/content/show.php?content=24364
 KEYWORDS=~amd64
 LICENSE=public-domain
 RDEPEND=x11-themes/hicolor-icon-theme
 SLOT=0
 SRC_URI=mirror://gentoo/gargantuan-icon-theme-1.7.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=565857c782703898dea1335b69675eb8
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d9fced8cdc9789efba250a14781d9a4a
diff --git a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.36.0 b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.36.0
index 0df549582949..3bfd3596dc2d 100644
--- a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.36.0
+++ b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.36.0
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-backgrounds/3.36/gnome-backgrounds-3.36.0.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8eee51403635a4349c9557dd0e1f960b
diff --git a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.38.0 b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.38.0
index 42bc1871c3d9..3318ad20bb0d 100644
--- a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.38.0
+++ b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.38.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=A set of backgrounds packaged with the GNOME desktop
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/gnome-backgrounds
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-backgrounds/3.38/gnome-backgrounds-3.38.0.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=80256413305df1ebb80d38e03f0ab7d8
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=cb801aa03ecb3038e686a3ab814ccae6
diff --git a/metadata/md5-cache/x11-themes/greybird-3.22.14 b/metadata/md5-cache/x11-themes/greybird-3.22.14
index 94a222a30fcd..1df3d104554c 100644
--- a/metadata/md5-cache/x11-themes/greybird-3.22.14
+++ b/metadata/md5-cache/x11-themes/greybird-3.22.14
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 x11-themes/gtk-engines-murrine
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/shimmerproject/Greybird/archive/v3.22.14.tar.gz -> greybird-3.22.14.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f06a13dcbfb8175c65a445e513226deb
diff --git a/metadata/md5-cache/x11-themes/light-themes-17.04_p20170406 b/metadata/md5-cache/x11-themes/light-themes-17.04_p20170406
deleted file mode 100644
index 183115c072ad..000000000000
--- a/metadata/md5-cache/x11-themes/light-themes-17.04_p20170406
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/xz-utils
-DESCRIPTION=GTK2/GTK3 Ambiance and Radiance themes from Ubuntu
-EAPI=5
-HOMEPAGE=https://packages.ubuntu.com/zesty/light-themes
-IUSE=gtk3
-KEYWORDS=amd64 x86
-LICENSE=CC-BY-SA-3.0 CC-BY-SA-4.0
-RDEPEND=x11-themes/gtk-engines-murrine gtk3? ( x11-themes/gtk-engines-unico )
-SLOT=0
-SRC_URI=mirror://ubuntu/pool/main/u/ubuntu-themes/ubuntu-themes_16.10+17.04.20170406.orig.tar.gz https://dev.gentoo.org/~pacho/light-themes/Gentoo-Buttons-r1.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e5cfcce578e0e332d534e884e2743f0f
diff --git a/metadata/md5-cache/x11-themes/light-themes-17.04_p20170406-r2 b/metadata/md5-cache/x11-themes/light-themes-17.04_p20170406-r2
deleted file mode 100644
index b8944ee61c74..000000000000
--- a/metadata/md5-cache/x11-themes/light-themes-17.04_p20170406-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/xz-utils
-DESCRIPTION=GTK2/GTK3 Ambiance and Radiance themes from Ubuntu
-EAPI=7
-HOMEPAGE=https://packages.ubuntu.com/zesty/light-themes
-IUSE=gtk3
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-SA-3.0 CC-BY-SA-4.0
-RDEPEND=x11-themes/gtk-engines-murrine gtk3? ( x11-themes/gtk-engines-unico )
-SLOT=0
-SRC_URI=mirror://ubuntu/pool/main/u/ubuntu-themes/ubuntu-themes_16.10+17.04.20170406.orig.tar.gz https://dev.gentoo.org/~pacho/light-themes/Gentoo-Buttons-r1.tar.xz
-_md5_=8c9aa6ab84b532fd88c4676db1971a35
diff --git a/metadata/md5-cache/x11-themes/light-themes-19.04-r2 b/metadata/md5-cache/x11-themes/light-themes-19.04-r2
deleted file mode 100644
index cb2def7dbad7..000000000000
--- a/metadata/md5-cache/x11-themes/light-themes-19.04-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/xz-utils
-DESCRIPTION=GTK2/GTK3 Ambiance and Radiance themes from Ubuntu
-EAPI=7
-HOMEPAGE=https://packages.ubuntu.com/zesty/light-themes
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-SA-3.0 CC-BY-SA-4.0
-RDEPEND=x11-themes/gtk-engines-murrine
-SLOT=0
-SRC_URI=mirror://ubuntu/pool/main/u/ubuntu-themes/ubuntu-themes_19.04.orig.tar.gz https://dev.gentoo.org/~pacho/light-themes/Gentoo-Buttons-r1.tar.xz
-_md5_=631d62906b1e2790feb9f19f9c07a480
diff --git a/metadata/md5-cache/x11-themes/nou-icon-theme-09.02.08 b/metadata/md5-cache/x11-themes/nou-icon-theme-09.02.08
index d2c1e2ba7608..55d71119f7f4 100644
--- a/metadata/md5-cache/x11-themes/nou-icon-theme-09.02.08
+++ b/metadata/md5-cache/x11-themes/nou-icon-theme-09.02.08
@@ -1,13 +1,11 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=A scalable icon theme called Nou
-EAPI=5
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Scalable icon theme called Nou
+EAPI=7
 HOMEPAGE=http://www.silvestre.com.ar/
-IUSE=minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!minimal? ( || ( x11-themes/tango-icon-theme x11-themes/adwaita-icon-theme ) )
-RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=http://www.silvestre.com.ar/icons/Nou-090208.tar.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b372b9566a312c6e2d331e065d599c2
+SRC_URI=mirror://gentoo/Nou-090208.tar.bz2
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f87992c3da9ac122ee65d46736afecf6
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-18.07.17 b/metadata/md5-cache/x11-themes/numix-icon-theme-18.07.17
index 49323ade1e95..80c90951b9db 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-18.07.17
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-18.07.17
@@ -1,10 +1,11 @@
-DEFINED_PHASES=install postinst postrm preinst
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An official icon theme from the Numix Project
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/numixproject
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/numixproject/numix-icon-theme/archive/18.07.17.tar.gz -> numix-icon-theme-18.07.17.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=555766d57d2f427395785ed5d862527f
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=21c888c340d670573413991d3f43b5a4
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-19.09.20 b/metadata/md5-cache/x11-themes/numix-icon-theme-19.09.20
index c29d833dd348..4650770d811c 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-19.09.20
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-19.09.20
@@ -1,10 +1,11 @@
-DEFINED_PHASES=install postinst postrm preinst
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An official icon theme from the Numix Project
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/numixproject
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/numixproject/numix-icon-theme/archive/19.09.20.tar.gz -> numix-icon-theme-19.09.20.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5b044e0aa5be113ee7037f4d9eea2e8c
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=21c888c340d670573413991d3f43b5a4
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-20.03.20 b/metadata/md5-cache/x11-themes/numix-icon-theme-20.03.20
index 8f82cf00b4ee..1dc8e7fc5b9b 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-20.03.20
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-20.03.20
@@ -1,10 +1,11 @@
-DEFINED_PHASES=install postinst postrm preinst
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An official icon theme from the Numix Project
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/numixproject
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/numixproject/numix-icon-theme/archive/20.03.20.tar.gz -> numix-icon-theme-20.03.20.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da9c60ed232431f1cda025ae130e2a67
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bedf0cbdbc3483b9966f50bf587719dc
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-20.06.07 b/metadata/md5-cache/x11-themes/numix-icon-theme-20.06.07
index a60f519dfdc0..0fccb71adb2a 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-20.06.07
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-20.06.07
@@ -1,10 +1,11 @@
-DEFINED_PHASES=install postinst postrm preinst
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An official icon theme from the Numix Project
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/numixproject
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/numixproject/numix-icon-theme/archive/20.06.07.tar.gz -> numix-icon-theme-20.06.07.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da9c60ed232431f1cda025ae130e2a67
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bedf0cbdbc3483b9966f50bf587719dc
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.08.29 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.08.29
deleted file mode 100644
index 55ef6818e2c9..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.08.29
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/numix-icon-theme
-DESCRIPTION=An icon theme for Linux from the Numix project
-EAPI=6
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/numix-icon-theme
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/18.08.29.tar.gz -> numix-icon-theme-circle-18.08.29.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75dd03998df171086ff0d56c81a3637a
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.09.19 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.09.19
deleted file mode 100644
index 3c35ed1c2ac0..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.09.19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/numix-icon-theme
-DESCRIPTION=An icon theme for Linux from the Numix project
-EAPI=6
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/numix-icon-theme
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/18.09.19.tar.gz -> numix-icon-theme-circle-18.09.19.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d4e4538d685044bcc09e403fd8c07123
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.10.03 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.10.03
deleted file mode 100644
index 3e5500a5592f..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.10.03
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/numix-icon-theme
-DESCRIPTION=An icon theme for Linux from the Numix project
-EAPI=6
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/numix-icon-theme
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/18.10.03.tar.gz -> numix-icon-theme-circle-18.10.03.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d4e4538d685044bcc09e403fd8c07123
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.12.01 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.12.01
deleted file mode 100644
index c3f556393cca..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-18.12.01
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/numix-icon-theme
-DESCRIPTION=An icon theme for Linux from the Numix project
-EAPI=6
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/numix-icon-theme
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/18.12.01.tar.gz -> numix-icon-theme-circle-18.12.01.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d4e4538d685044bcc09e403fd8c07123
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.01.24 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.01.24
deleted file mode 100644
index aec1fb67f443..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.01.24
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/numix-icon-theme
-DESCRIPTION=An icon theme for Linux from the Numix project
-EAPI=6
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/numix-icon-theme
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/19.01.24.tar.gz -> numix-icon-theme-circle-19.01.24.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da9f123dfd3dd6dcaf79efb206bffffe
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.02.07 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.02.07
deleted file mode 100644
index 8b3cf20d4c74..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.02.07
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/numix-icon-theme
-DESCRIPTION=An icon theme for Linux from the Numix project
-EAPI=6
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/numix-icon-theme
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/19.02.07.tar.gz -> numix-icon-theme-circle-19.02.07.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da9f123dfd3dd6dcaf79efb206bffffe
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.02.22 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.02.22
deleted file mode 100644
index b9cf8284b7a8..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.02.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/numix-icon-theme
-DESCRIPTION=An icon theme for Linux from the Numix project
-EAPI=6
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/numix-icon-theme
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/19.02.22.tar.gz -> numix-icon-theme-circle-19.02.22.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da9f123dfd3dd6dcaf79efb206bffffe
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.03.20 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.03.20
deleted file mode 100644
index 0fdaa82d55d4..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.03.20
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/numix-icon-theme
-DESCRIPTION=An icon theme for Linux from the Numix project
-EAPI=6
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/numix-icon-theme
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/19.03.20.tar.gz -> numix-icon-theme-circle-19.03.20.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da9f123dfd3dd6dcaf79efb206bffffe
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.04.15 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.04.15
deleted file mode 100644
index aa342832ad07..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.04.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/numix-icon-theme
-DESCRIPTION=An icon theme for Linux from the Numix project
-EAPI=6
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/numix-icon-theme
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/19.04.15.tar.gz -> numix-icon-theme-circle-19.04.15.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da9f123dfd3dd6dcaf79efb206bffffe
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.05.07 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.05.07
deleted file mode 100644
index c2fd232a5492..000000000000
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.05.07
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/numix-icon-theme
-DESCRIPTION=An icon theme for Linux from the Numix project
-EAPI=6
-HOMEPAGE=https://github.com/numixproject
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-themes/numix-icon-theme
-SLOT=0
-SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/19.05.07.tar.gz -> numix-icon-theme-circle-19.05.07.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da9f123dfd3dd6dcaf79efb206bffffe
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.09.20 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.09.20
index daa0c5222943..fceb9ca995c5 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.09.20
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.09.20
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/numix-icon-theme
-DESCRIPTION=An icon theme for Linux from the Numix project
-EAPI=6
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Icon theme from the Numix project
+EAPI=7
 HOMEPAGE=https://github.com/numixproject
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=x11-themes/numix-icon-theme
 SLOT=0
 SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/19.09.20.tar.gz -> numix-icon-theme-circle-19.09.20.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da9f123dfd3dd6dcaf79efb206bffffe
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d75733f3a34ad750c525b3522b88becf
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.12.27 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.12.27
index 4dca7869f882..be51684a42eb 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.12.27
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.12.27
@@ -1,6 +1,6 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/numix-icon-theme
-DESCRIPTION=An icon theme for Linux from the Numix project
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Icon theme from the Numix project
 EAPI=7
 HOMEPAGE=https://github.com/numixproject
 KEYWORDS=~amd64 ~x86
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-themes/numix-icon-theme
 SLOT=0
 SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/19.12.27.tar.gz -> numix-icon-theme-circle-19.12.27.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ef4f9e5d6cb3e6800718b2c3b2c98ab
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc01a1e890c33b8fc37919a1e2fc1aaa
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.06.07 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.06.07
index bd26955973f7..42dcf7c704dc 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.06.07
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.06.07
@@ -1,6 +1,6 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/numix-icon-theme
-DESCRIPTION=An icon theme for Linux from the Numix project
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Icon theme from the Numix project
 EAPI=7
 HOMEPAGE=https://github.com/numixproject
 KEYWORDS=~amd64 ~x86
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-themes/numix-icon-theme
 SLOT=0
 SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/20.06.07.tar.gz -> numix-icon-theme-circle-20.06.07.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ef4f9e5d6cb3e6800718b2c3b2c98ab
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc01a1e890c33b8fc37919a1e2fc1aaa
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.07.11 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.07.11
index edd129bdcd82..c562bab4a1bb 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.07.11
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.07.11
@@ -1,6 +1,6 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=x11-themes/numix-icon-theme
-DESCRIPTION=An icon theme for Linux from the Numix project
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Icon theme from the Numix project
 EAPI=7
 HOMEPAGE=https://github.com/numixproject
 KEYWORDS=~amd64 ~x86
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-themes/numix-icon-theme
 SLOT=0
 SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/20.07.11.tar.gz -> numix-icon-theme-circle-20.07.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ef4f9e5d6cb3e6800718b2c3b2c98ab
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc01a1e890c33b8fc37919a1e2fc1aaa
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.09.19 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.09.19
new file mode 100644
index 000000000000..3aed31cecf8e
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.09.19
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Icon theme from the Numix project
+EAPI=7
+HOMEPAGE=https://github.com/numixproject
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=x11-themes/numix-icon-theme
+SLOT=0
+SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/20.09.19.tar.gz -> numix-icon-theme-circle-20.09.19.tar.gz
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc01a1e890c33b8fc37919a1e2fc1aaa
diff --git a/metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5 b/metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5
deleted file mode 100644
index e481ade8cb65..000000000000
--- a/metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=A scalable icon theme called Nuovo
-EAPI=5
-HOMEPAGE=http://www.silvestre.com.ar/
-IUSE=minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!minimal? ( x11-themes/adwaita-icon-theme )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=http://www.silvestre.com.ar/icons/dlg-nuovo-0.5.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ecd38d278218ffa1c9fad6b80c3431a3
diff --git a/metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5-r1 b/metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5-r1
new file mode 100644
index 000000000000..071ae38c25db
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A scalable icon theme called Nuovo
+EAPI=7
+HOMEPAGE=http://www.silvestre.com.ar/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/dlg-nuovo-0.5.tar.bz2
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4fe2aefdbb58ea9860ab2838aa54ac4e
diff --git a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1 b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
index c279bf7a8986..bcd8bdfcb596 100644
--- a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
+++ b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/dbus-glib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !x11-themes/oxygen-gtk:0
 SLOT=3
 SRC_URI=mirror://kde/stable/oxygen-gtk3/1.4.1/src/oxygen-gtk3-1.4.1.tar.bz2
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=faa96f470a7ef99969f05590c4325964
diff --git a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1 b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
index 6452c1435697..43a6064f29c0 100644
--- a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
+++ b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/dbus-glib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !x11-themes/oxygen-gtk:0
 SLOT=2
 SRC_URI=mirror://kde/stable/oxygen-gtk2/1.4.6/src/oxygen-gtk2-1.4.6.tar.bz2
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8bb507aafc237edcac112168aa0aaf99
diff --git a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.6 b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.6
deleted file mode 100644
index 1aa4f6a7db6a..000000000000
--- a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXcursor x11-apps/xcursorgen >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org cursor themes: whiteglass, redglass and handhelds
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/data/xcursor-themes
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXcursor
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/data/xcursor-themes-1.0.6.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	009fca0e5c204153e050aa66203715d7
-_md5_=c4f37746180564b89c929f6a5276004a
diff --git a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.6-r1 b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.6-r1
new file mode 100644
index 000000000000..ab419acf6513
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.6-r1
@@ -0,0 +1,12 @@
+BDEPEND=x11-apps/xcursorgen >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DESCRIPTION=X.Org cursor themes: whiteglass, redglass and handhelds
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/data/xcursor-themes
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXcursor
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/data/xcursor-themes-1.0.6.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_md5_=ff5058130af43effd36a991aaf2accc8
diff --git a/metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2 b/metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2
deleted file mode 100644
index 07ccab04cdee..000000000000
--- a/metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=A scalable icon theme called Yasis
-EAPI=5
-HOMEPAGE=http://www.silvestre.com.ar/
-IUSE=minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!minimal? ( || ( x11-themes/adwaita-icon-theme x11-themes/nuovo-icon-theme ) )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=http://www.silvestre.com.ar/icons/yasis-0.4.2.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f315ed10450a27cefd5dbc92e82f677e
diff --git a/metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2-r1 b/metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2-r1
new file mode 100644
index 000000000000..35e4fd815ce3
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Scalable icon theme called Yasis
+EAPI=7
+HOMEPAGE=http://www.silvestre.com.ar/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/yasis-0.4.2.tar.bz2
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=af1e235c9e741048a2a1b009055ed962