2021-04-19 22:50:11 UTC

16 files changed, 44 insertions, 107 deletions

diff --git a/metadata/md5-cache/app-cdr/mp3burn-0.4.2 b/metadata/md5-cache/app-cdr/mp3burn-0.4.2
index e94f2217653b..64a5f0c7d486 100644
--- a/metadata/md5-cache/app-cdr/mp3burn-0.4.2
+++ b/metadata/md5-cache/app-cdr/mp3burn-0.4.2
@@ -1,13 +1,11 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=install
 DESCRIPTION=Burn mp3s without filling up your disk with .wav files
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/mp3burn
-INHERIT=eutils
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl app-cdr/cdrtools media-sound/mpg123 media-libs/flac media-sound/vorbis-tools dev-perl/MP3-Info dev-perl/Ogg-Vorbis-Header dev-perl/String-ShellQuote
+RDEPEND=app-cdr/cdrtools dev-lang/perl dev-perl/MP3-Info dev-perl/Ogg-Vorbis-Header dev-perl/String-ShellQuote media-libs/flac media-sound/mpg123 media-sound/vorbis-tools
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3burn/mp3burn-0.4.2.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
-_md5_=8b0dee5ebc3f92998dace5b521aff31f
+_md5_=47e66b3b26d43d691a02cf3025e75b12
diff --git a/metadata/md5-cache/app-editors/elvis-2.2.0-r6 b/metadata/md5-cache/app-editors/elvis-2.2.0-r6
deleted file mode 100644
index 1e91f4a63ee9..000000000000
--- a/metadata/md5-cache/app-editors/elvis-2.2.0-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.7-r7:0= X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) app-eselect/eselect-vi X? ( x11-base/xorg-proto ) virtual/pkgconfig
-DESCRIPTION=A vi/ex clone
-EAPI=5
-HOMEPAGE=ftp://ftp.cs.pdx.edu/pub/elvis/
-INHERIT=epatch versionator toolchain-funcs
-IUSE=X
-KEYWORDS=amd64 ppc ppc64 x86 ~ppc-macos ~sparc-solaris
-LICENSE=Artistic
-RDEPEND=>=sys-libs/ncurses-5.7-r7:0= X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) app-eselect/eselect-vi
-SLOT=0
-SRC_URI=ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=ac010cdb98470e530c8d770919857aee
diff --git a/metadata/md5-cache/app-editors/elvis-2.2.0-r7 b/metadata/md5-cache/app-editors/elvis-2.2.0-r7
deleted file mode 100644
index a9b4efcc6cb0..000000000000
--- a/metadata/md5-cache/app-editors/elvis-2.2.0-r7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) X? ( x11-base/xorg-proto ) virtual/pkgconfig
-DESCRIPTION=A vi/ex clone
-EAPI=6
-HOMEPAGE=http://elvis.the-little-red-haired-girl.org
-IUSE=X
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~sparc-solaris
-LICENSE=Artistic
-RDEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 )
-SLOT=0
-SRC_URI=ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=a40750c04654ffc24e03b322c2ac52ff
diff --git a/metadata/md5-cache/app-editors/elvis-2.2.0-r8 b/metadata/md5-cache/app-editors/elvis-2.2.0-r8
index 109f15efdab8..7cec1ff0ca80 100644
--- a/metadata/md5-cache/app-editors/elvis-2.2.0-r8
+++ b/metadata/md5-cache/app-editors/elvis-2.2.0-r8
@@ -3,11 +3,12 @@ DEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-libs/libX11-1.0.0 >
 DESCRIPTION=A vi/ex clone
 EAPI=6
 HOMEPAGE=http://elvis.the-little-red-haired-girl.org
+INHERIT=versionator toolchain-funcs
 IUSE=X doc
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~ppc-macos ~sparc-solaris
 LICENSE=Artistic
 RDEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 )
 SLOT=0
 SRC_URI=ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=558f56d61852d64991865544089843e8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=330c1310a061ab168a7b50605ccf210d
diff --git a/metadata/md5-cache/app-i18n/im-canna-0.3.2.2 b/metadata/md5-cache/app-i18n/im-canna-0.3.2.2
deleted file mode 100644
index 35c65bba8b72..000000000000
--- a/metadata/md5-cache/app-i18n/im-canna-0.3.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=postinst postrm
-DEPEND=app-i18n/canna x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Japanese Canna input method module for GTK+2
-EAPI=6
-HOMEPAGE=http://bonobo.gnome.gr.jp/~nakai/immodule/
-INHERIT=gnome2-utils
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/canna x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-canna-0.3.2.2.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	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
-_md5_=7cfc7253da9e285ce1f722899adc802f
diff --git a/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1 b/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1
index 3b59f345b0d1..e5b8dbb24b69 100644
--- a/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1
+++ b/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Japanese Canna input method module for GTK+2
 EAPI=6
 HOMEPAGE=http://bonobo.gnome.gr.jp/~nakai/immodule/
 INHERIT=autotools gnome2-utils ltprune
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=app-i18n/canna x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-canna-0.3.2.2.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	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
-_md5_=9a2992c882e96d839b8cd4377cda469b
+_md5_=370ea8752fee7a36b0e630d256f82ba6
diff --git a/metadata/md5-cache/app-vim/alternate-2.18-r1 b/metadata/md5-cache/app-vim/alternate-2.18-r1
deleted file mode 100644
index c59eacaf70c4..000000000000
--- a/metadata/md5-cache/app-vim/alternate-2.18-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: quickly switch between .c and .h files
-EAPI=6
-HOMEPAGE=https://github.com/vim-scripts/a.vim https://www.vim.org/scripts/script.php?script_id=31
-INHERIT=vim-plugin
-KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=alternate
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/alternate-2.18.tar.bz2 https://dev.gentoo.org/~radhermit/vim/alternate-2.18.tar.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=a6f43c1c7d459e6375677b977e513c52
diff --git a/metadata/md5-cache/app-vim/alternate-2.18-r2 b/metadata/md5-cache/app-vim/alternate-2.18-r2
index aa097ff6fa2f..f74808b361b8 100644
--- a/metadata/md5-cache/app-vim/alternate-2.18-r2
+++ b/metadata/md5-cache/app-vim/alternate-2.18-r2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: quickly switch between .c and .h files
 EAPI=6
 HOMEPAGE=https://github.com/vim-scripts/a.vim https://www.vim.org/scripts/script.php?script_id=31
-KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+INHERIT=vim-plugin
+KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=alternate
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/a.vim/archive/2.18.tar.gz -> alternate-2.18.tar.gz https://www.vim.org/scripts/download_script.php?src_id=6347 -> alternate.txt
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=7d0aba200bff90c9bdbe6dc85ff2c831
+_md5_=84209f1aab31db4a2a932b8c8140bdc8
diff --git a/metadata/md5-cache/app-vim/genutils-2.5 b/metadata/md5-cache/app-vim/genutils-2.5
deleted file mode 100644
index 682b3bbefd86..000000000000
--- a/metadata/md5-cache/app-vim/genutils-2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: library with various useful functions
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=197
-KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
-LICENSE=GPL-3
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=11399 -> genutils-2.5.zip
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=6b1e799876a2f29afebbf2600f3367ac
diff --git a/metadata/md5-cache/app-vim/genutils-2.5-r1 b/metadata/md5-cache/app-vim/genutils-2.5-r1
index da8286bd6f97..01db843c96b8 100644
--- a/metadata/md5-cache/app-vim/genutils-2.5-r1
+++ b/metadata/md5-cache/app-vim/genutils-2.5-r1
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: library with various useful functions
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=197
-KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
+INHERIT=vim-plugin
+KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=11399 -> genutils-2.5.zip
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=cf57639880e205715b0aee9b9d0a3569
+_md5_=e9ae61156fac980c19c7b34a0c756490
diff --git a/metadata/md5-cache/app-vim/taglist-4.6 b/metadata/md5-cache/app-vim/taglist-4.6
index b80f7761098d..ae91333249a1 100644
--- a/metadata/md5-cache/app-vim/taglist-4.6
+++ b/metadata/md5-cache/app-vim/taglist-4.6
@@ -1,13 +1,13 @@
-DEFINED_PHASES=install postinst postrm prepare
+DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: ctags-based source code browser
-EAPI=5
+EAPI=7
 HOMEPAGE=http://vim-taglist.sourceforge.net/
-INHERIT=vim-plugin epatch
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=vim
 RDEPEND=dev-util/ctags || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/taglist-4.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/taglist-4.6.tar.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	3160d9cb05ef44497be1485db0fe7590	epatch	9f813bb3c47cf2e60619a663b87c5f4e
-_md5_=cad2fbf6e1ccd7b5844f19f7031a4818
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=47a939a1eae3787d45b1d1d28423a854
diff --git a/metadata/md5-cache/x11-themes/gartoon-redux-1.10-r1 b/metadata/md5-cache/x11-themes/gartoon-redux-1.10-r1
index 276c4c032992..9079c34c7811 100644
--- a/metadata/md5-cache/x11-themes/gartoon-redux-1.10-r1
+++ b/metadata/md5-cache/x11-themes/gartoon-redux-1.10-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-lang/perl dev-perl/Switch gnome-base/librsvg
+BDEPEND=dev-lang/perl dev-perl/Switch gnome-base/librsvg
+DEFINED_PHASES=compile configure install postinst postrm preinst
 DESCRIPTION=A massively improved variant of the well-known Gartoon theme
-EAPI=5
+EAPI=7
 HOMEPAGE=https://gnome-look.org/content/show.php/?content=74841
-INHERIT=epatch gnome2-utils
+INHERIT=gnome2-utils
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://tweenk.artfx.pl/gartoon/source/gartoon-redux-1.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
-_md5_=9d98803e9906f884c92c2525a17dc7d8
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
+_md5_=cd645fdbbb9d0ff4639c3c27696ccc43
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2 b/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
index 79f3c64530b1..b3aaf280b43c 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
+++ b/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=x11-libs/gtk+:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Theme engine based on GTK pixmap engine using the Plasma color scheme
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.kde-look.org/content/show.php?content=7043
-INHERIT=autotools epatch gnome2
+INHERIT=autotools gnome2
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.cpdrummond.freeuk.com/QtPixmap-0.28.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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	df5c6c53843e1be0aad724138e78bbc3	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168
-_md5_=4ad3e5acbd5dc3397f6076e9ff668f45
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	gnome.org	df5c6c53843e1be0aad724138e78bbc3	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168
+_md5_=54f20365b1a61def6a2a32d755213585
diff --git a/metadata/md5-cache/x11-wm/wm2-4-r1 b/metadata/md5-cache/x11-wm/wm2-4-r1
index f36c7f8c22ff..cb6af4b30fc4 100644
--- a/metadata/md5-cache/x11-wm/wm2-4-r1
+++ b/metadata/md5-cache/x11-wm/wm2-4-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst prepare
 DEPEND=x11-libs/libXmu x11-base/xorg-proto
 DESCRIPTION=Small, unconfigurable window manager
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.all-day-breakfast.com/wm2/
-INHERIT=epatch toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=wm2 HPND
 RDEPEND=x11-libs/libXmu
 SLOT=0
 SRC_URI=http://www.all-day-breakfast.com/wm2/wm2-4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=d4f840554db39f6f5ec6a8b8e055cac5
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=8c48a7d132d49ef6745380ac80413d1d
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index b950ea8a1e10..4af10596cfa2 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -1903,7 +1903,7 @@ app-editors/dhex 0.69: ncurses-based hex-editor with diff mode
 app-editors/diakonos 0.9.4: A Linux editor for the masses
 app-editors/e3 2.8.2: Very tiny editor in ASM with emacs, pico, wordstar, and vi keybindings
 app-editors/ee 1.5.2: An easy to use text editor. A subset of aee
-app-editors/elvis 2.2.0-r6 2.2.0-r7 2.2.0-r8: A vi/ex clone
+app-editors/elvis 2.2.0-r8: A vi/ex clone
 app-editors/emacs 18.59-r13 23.4-r20 24.5-r10 25.3-r9 26.3-r4 27.1-r4 27.2 27.2.9999 28.0.9999: The extensible, customizable, self-documenting real-time display editor
 app-editors/emact 2.58.0: EmACT, a fork of Conroy's MicroEmacs
 app-editors/ersatz-emacs 20060515-r1: A very minimal imitation of the famous GNU Emacs editor
@@ -2414,7 +2414,7 @@ app-i18n/ibus-table-latin 1.2.0.20100305: Latin tables for IBus-Table
 app-i18n/ibus-table-others 1.3.9 1.3.11: Various tables for IBus-Table
 app-i18n/ibus-typing-booster 2.10.2 2.10.5: Completion input method for IBus
 app-i18n/ibus-unikey 0.6.1-r2: Vietnamese UniKey engine for IBus
-app-i18n/im-canna 0.3.2.2 0.3.2.2-r1: Japanese Canna input method module for GTK+2
+app-i18n/im-canna 0.3.2.2-r1: Japanese Canna input method module for GTK+2
 app-i18n/im-chooser 1.7.0: Desktop Input Method configuration tool
 app-i18n/im-freewnn 0.0.2-r2 0.0.2-r3: Japanese FreeWnn input method module for GTK+2
 app-i18n/imhangul 2.1.0-r1 2.1.1 3.1.1: GTK+ 3 Hangul Input Modules
@@ -3300,7 +3300,7 @@ app-vim/ackvim 1.0.9-r1: vim plugin: run ack from vim
 app-vim/airline 0.11 9999: vim plugin: lean & mean statusline for vim that's light as air
 app-vim/airline-themes 0_pre20181021 9999: vim plugin: a collection of themes for vim-airline
 app-vim/align 43: vim plugin: commands and maps to help produce aligned text
-app-vim/alternate 2.18-r1 2.18-r2: vim plugin: quickly switch between .c and .h files
+app-vim/alternate 2.18-r2: vim plugin: quickly switch between .c and .h files
 app-vim/ansiesc 12: vim plugin: ansi escape sequences concealed, but highlighted as specified
 app-vim/ant_menu 0.5.7.1-r1: vim plugin: Java ant build system integration
 app-vim/autoalign 14: vim plugin: automatically align bib, c, c++, tex and vim code
@@ -3350,7 +3350,7 @@ app-vim/fugitive 2.4 2.5 3.1 3.2 9999: vim plugin: a git wrapper for vim
 app-vim/fuzzyfinder 4.2.2: vim plugin: buffer/file/command/tag/etc explorer with fuzzy matching
 app-vim/genindent 1.1-r1: vim plugin: library for simplifying indent files
 app-vim/gentoo-syntax 20201216 99999999: vim plugin: Gentoo and Portage syntax highlighting
-app-vim/genutils 2.5 2.5-r1: vim plugin: library with various useful functions
+app-vim/genutils 2.5-r1: vim plugin: library with various useful functions
 app-vim/gist 7.3: vim plugin: interact with gists (gist.github.com)
 app-vim/git-patch-tags 0.2: vim plugin: add git patch tags as used in linux kernel development
 app-vim/gitgutter 20180316 20180815 99999999: vim plugin: shows a git diff in the sign column and stages/reverts hunks
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 37feac704edb..3a8a50a88230 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 19 Apr 2021 22:05:13 +0000
+Mon, 19 Apr 2021 22:50:11 +0000