2021-03-22 08:51:07 UTC

author: Repository mirror & CI <repomirrorci@gentoo.org> 2021-03-22 08:51:09 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2021-03-22 08:51:09 +0000
commit: 33f2d770c28307b1e9a1199c681e1c543602c6d4 (patch)
tree: b3e2cf5bdb1a5f1ed8a908ee5fbd04989eadedbc /metadata/md5-cache
parent: Merge updates from master (diff)
download: gentoo-33f2d770c28307b1e9a1199c681e1c543602c6d4.tar.gz
gentoo-33f2d770c28307b1e9a1199c681e1c543602c6d4.tar.bz2
gentoo-33f2d770c28307b1e9a1199c681e1c543602c6d4.zip
416 files changed, 804 insertions, 468 deletions
diff --git a/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2 b/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
index 6f4ab9e1a252..7801060a9599 100644
--- a/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
+++ b/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
@@ -3,11 +3,12 @@ DEPEND=espeak? ( app-accessibility/espeak ) >=app-editors/emacs-24:*
 DESCRIPTION=the emacspeak audio desktop
 EAPI=6
 HOMEPAGE=http://emacspeak.sourceforge.net/
+INHERIT=elisp readme.gentoo-r1
 IUSE=+espeak
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD GPL-2
 RDEPEND=espeak? ( app-accessibility/espeak ) >=dev-tcltk/tclx-8.4 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://emacspeak.googlecode.com/files/emacspeak-39.0.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=02876f569083daff9874034ee9576174
diff --git a/metadata/md5-cache/app-accessibility/emacspeak-9999 b/metadata/md5-cache/app-accessibility/emacspeak-9999
index e12f8efd8696..368801be9a57 100644
--- a/metadata/md5-cache/app-accessibility/emacspeak-9999
+++ b/metadata/md5-cache/app-accessibility/emacspeak-9999
@@ -3,10 +3,11 @@ DEPEND=espeak? ( app-accessibility/espeak ) >=app-editors/emacs-24:* >=dev-vcs/g
 DESCRIPTION=the emacspeak audio desktop
 EAPI=6
 HOMEPAGE=http://emacspeak.sourceforge.net/
+INHERIT=elisp readme.gentoo-r1 git-r3
 IUSE=+espeak
 LICENSE=BSD GPL-2
 PROPERTIES=live
 RDEPEND=espeak? ( app-accessibility/espeak ) >=dev-tcltk/tclx-8.4 >=app-editors/emacs-24:*
 SLOT=0
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	git-r3	3e7ec3d6619213460c85e2aa48398441	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=bb5e081141fefe72f22d1d7405b36da5
diff --git a/metadata/md5-cache/app-accessibility/speechd-el-2.8 b/metadata/md5-cache/app-accessibility/speechd-el-2.8
index d5956bbe0856..15384803862a 100644
--- a/metadata/md5-cache/app-accessibility/speechd-el-2.8
+++ b/metadata/md5-cache/app-accessibility/speechd-el-2.8
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs speech support
 EAPI=7
 HOMEPAGE=https://www.freebsoft.org/speechd-el
+INHERIT=elisp
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.7 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://www.freebsoft.org/pub/projects/speechd-el/speechd-el-2.8.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=fc2e4778154e1931e1c01597b9b65c78
diff --git a/metadata/md5-cache/app-admin/pass-1.7.3 b/metadata/md5-cache/app-admin/pass-1.7.3
index 69006ea136ec..45bffebda965 100644
--- a/metadata/md5-cache/app-admin/pass-1.7.3
+++ b/metadata/md5-cache/app-admin/pass-1.7.3
@@ -2,11 +2,12 @@ DEFINED_PHASES=compile install postinst postrm prepare
 DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
 EAPI=6
 HOMEPAGE=https://www.passwordstore.org/
+INHERIT=bash-completion-r1 elisp-common
 IUSE=+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.3.tar.xz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=c212f1491880a9837abab79581527ec3
diff --git a/metadata/md5-cache/app-admin/pass-9999 b/metadata/md5-cache/app-admin/pass-9999
index 1511132e18af..e79635e90c58 100644
--- a/metadata/md5-cache/app-admin/pass-9999
+++ b/metadata/md5-cache/app-admin/pass-9999
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install postinst postrm prepare unpack
 DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
 EAPI=7
 HOMEPAGE=https://www.passwordstore.org/
+INHERIT=bash-completion-r1 elisp-common git-r3
 IUSE=+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 SLOT=0
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=9fe571389a52cdadab13a52b8931842f
diff --git a/metadata/md5-cache/app-doc/casting-spels-emacs-19-r2 b/metadata/md5-cache/app-doc/casting-spels-emacs-19-r2
index 78976ea79ece..2e8eaf8e0455 100644
--- a/metadata/md5-cache/app-doc/casting-spels-emacs-19-r2
+++ b/metadata/md5-cache/app-doc/casting-spels-emacs-19-r2
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Casting SPELs in Lisp - A Comic Book (Emacs Lisp Edition)
 EAPI=6
 HOMEPAGE=http://www.lisperati.com/casting-spels-emacs/html/casting-spels-emacs-1.html https://www.gnu.org/software/emacs/casting-spels-emacs/
+INHERIT=elisp-common
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ FDL-1.2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://casting-spels-emacs.googlecode.com/files/casting-spels-emacs-v19.zip
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=47ea6be5ef00bed6c4e4a88716a6b4b5
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r20 b/metadata/md5-cache/app-editors/emacs-23.4-r20
index 1d9a8b90f12a..9b4aa6716f18 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r20
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r20
@@ -1,6 +1,6 @@
 BDEPEND=app-eselect/eselect-emacs virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=acct-group/mail app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
@@ -8,8 +8,8 @@ INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 IUSE=alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=acct-group/mail app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=23
 SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-23.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=a78830e612e93573daee90e02b07c107
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=295ae6b8d2f8cd52b58a92fc56933f09
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r10 b/metadata/md5-cache/app-editors/emacs-24.5-r10
index aaee03797827..39d7c1ac4bd9 100644
--- a/metadata/md5-cache/app-editors/emacs-24.5-r10
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r10
@@ -1,6 +1,6 @@
 BDEPEND=app-eselect/eselect-emacs virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=acct-group/mail app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
@@ -8,8 +8,8 @@ INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1
 IUSE=acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=acct-group/mail app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-5.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=b00fa8bef5cd722d3c057e59e7e7f8e2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=0a3a951747e89bfbd834ff0edb1388a5
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r9 b/metadata/md5-cache/app-editors/emacs-25.3-r9
index eb29b36155f9..7ac04677213f 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3-r9
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r9
@@ -1,6 +1,6 @@
 BDEPEND=app-eselect/eselect-emacs virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=acct-group/mail app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
@@ -8,8 +8,8 @@ INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=acct-group/mail app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !<app-editors/emacs-vcs-25.3 app-eselect/eselect-emacs
+RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !<app-editors/emacs-vcs-25.3 app-eselect/eselect-emacs
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-2.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=ce2b7de7b86526d5c7e464bbd04040bc
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=0ac850b3c0501b976d481f7796c4f19e
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r4 b/metadata/md5-cache/app-editors/emacs-26.3-r4
index c74b18dcdce2..26ccf1cdd55a 100644
--- a/metadata/md5-cache/app-editors/emacs-26.3-r4
+++ b/metadata/md5-cache/app-editors/emacs-26.3-r4
@@ -1,6 +1,6 @@
 BDEPEND=app-eselect/eselect-emacs virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
@@ -8,8 +8,8 @@ INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !<app-editors/emacs-vcs-26.3 app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !<app-editors/emacs-vcs-26.3 app-eselect/eselect-emacs
 SLOT=26
 SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=230199e87ffc427fee82d91fdbb4852c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=3a6dfa69c5aa32228cd7eeea06aa99ac
diff --git a/metadata/md5-cache/app-editors/emacs-27.1-r4 b/metadata/md5-cache/app-editors/emacs-27.1-r4
index 4a64cfcc2a07..1d2f4883f097 100644
--- a/metadata/md5-cache/app-editors/emacs-27.1-r4
+++ b/metadata/md5-cache/app-editors/emacs-27.1-r4
@@ -1,6 +1,6 @@
 BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
@@ -8,9 +8,9 @@ INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !<=app-editors/emacs-27.1.9999-r0:27-vcs !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !<=app-editors/emacs-27.1.9999-r0:27-vcs !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=27
 SRC_URI=mirror://gnu/emacs/emacs-27.1.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=7a56a33a895bb35387f31ae88af6d50c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=4036b99dcd993c56ccfd5153b32aaba0
diff --git a/metadata/md5-cache/app-editors/emacs-27.1.91-r1 b/metadata/md5-cache/app-editors/emacs-27.1.91-r1
index 1903bf3a040c..f8bb30b7309d 100644
--- a/metadata/md5-cache/app-editors/emacs-27.1.91-r1
+++ b/metadata/md5-cache/app-editors/emacs-27.1.91-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
@@ -8,9 +8,9 @@ INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=27-vcs
 SRC_URI=https://alpha.gnu.org/gnu/emacs/pretest/emacs-27.1.91.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=e51e8e6d17b3c40f87e7704e7a0255fe
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=4d1d6245b848dd62f155579f756f6202
diff --git a/metadata/md5-cache/app-editors/emacs-27.1.9999-r1 b/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
index 1d97345fbd0d..6ea3628e4374 100644
--- a/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
+++ b/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
@@ -8,8 +8,8 @@ INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs git
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 PROPERTIES=live
-RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=27-vcs
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	git-r3	3e7ec3d6619213460c85e2aa48398441
-_md5_=db681c35d52096677e4778a3a3d62c67
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	git-r3	3e7ec3d6619213460c85e2aa48398441
+_md5_=82449163004f00ab7cf4e7de6f8625ea
diff --git a/metadata/md5-cache/app-editors/emacs-27.2_rc1 b/metadata/md5-cache/app-editors/emacs-27.2_rc1
index 1cb0976ff601..69cf7a031f5c 100644
--- a/metadata/md5-cache/app-editors/emacs-27.2_rc1
+++ b/metadata/md5-cache/app-editors/emacs-27.2_rc1
@@ -1,6 +1,6 @@
 BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
@@ -8,9 +8,9 @@ INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=27
 SRC_URI=https://alpha.gnu.org/gnu/emacs/pretest/emacs-27.2-rc1.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=e51e8e6d17b3c40f87e7704e7a0255fe
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=4d1d6245b848dd62f155579f756f6202
diff --git a/metadata/md5-cache/app-editors/emacs-28.0.9999 b/metadata/md5-cache/app-editors/emacs-28.0.9999
index 4a3c2275c08a..a13a20f1cacd 100644
--- a/metadata/md5-cache/app-editors/emacs-28.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-28.0.9999
@@ -1,6 +1,6 @@
 BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
@@ -8,8 +8,8 @@ INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs git
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 PROPERTIES=live
-RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=28-vcs
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	git-r3	3e7ec3d6619213460c85e2aa48398441
-_md5_=3b49a2926571f6d795ab99400793548b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	git-r3	3e7ec3d6619213460c85e2aa48398441
+_md5_=069279c1df46c395be30e83e4933cd5a
diff --git a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527 b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
index 6d815c5bc516..cbcb1aa029a5 100644
--- a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
+++ b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A major mode for GNU Emacs for editing Actionscript 3 files
 EAPI=7
 HOMEPAGE=https://github.com/austinhaas/actionscript-mode
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/austinhaas/actionscript-mode/archive/65abd58e198458a8e46748c5962c41d80d60c4ea.tar.gz -> actionscript-mode-7.2.2_p20180527.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=e6ea45c8f98d76fd35975669c93e9def
diff --git a/metadata/md5-cache/app-emacs/adaptive-wrap-0.7 b/metadata/md5-cache/app-emacs/adaptive-wrap-0.7
index 2cc59bd9b7de..953cda36e435 100644
--- a/metadata/md5-cache/app-emacs/adaptive-wrap-0.7
+++ b/metadata/md5-cache/app-emacs/adaptive-wrap-0.7
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Smart line-wrapping with wrap-prefix
 EAPI=7
 HOMEPAGE=https://elpa.gnu.org/packages/adaptive-wrap.html
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/adaptive-wrap-0.7.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=f597d4059056b3b15e37a2853edafef6
diff --git a/metadata/md5-cache/app-emacs/analog-1.9.99 b/metadata/md5-cache/app-emacs/analog-1.9.99
index 59223dd19e5f..d58057e96f27 100644
--- a/metadata/md5-cache/app-emacs/analog-1.9.99
+++ b/metadata/md5-cache/app-emacs/analog-1.9.99
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Monitor lists of files or command output
 EAPI=7
 HOMEPAGE=https://web.archive.org/web/20150919120435/http://mph-emacs-pkgs.alioth.debian.org/AnalogEl.html
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/analog-1.9.99.el.bz2
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=922905ad92a1fb4d4a4bef6c2b782c52
diff --git a/metadata/md5-cache/app-emacs/apache-mode-2.2.0 b/metadata/md5-cache/app-emacs/apache-mode-2.2.0
index 365c3e592a51..bff09eec8a55 100644
--- a/metadata/md5-cache/app-emacs/apache-mode-2.2.0
+++ b/metadata/md5-cache/app-emacs/apache-mode-2.2.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Major mode for editing Apache configuration files
 EAPI=7
 HOMEPAGE=https://github.com/emacs-php/apache-mode
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-php/apache-mode/archive/2.2.0.tar.gz -> apache-mode-2.2.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=9014031c259b08e4280c27eddfc7ae53
diff --git a/metadata/md5-cache/app-emacs/apel-10.8-r1 b/metadata/md5-cache/app-emacs/apel-10.8-r1
index e03a3c17ec7e..b13cc73c8fe9 100644
--- a/metadata/md5-cache/app-emacs/apel-10.8-r1
+++ b/metadata/md5-cache/app-emacs/apel-10.8-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=A Portable Emacs Library is a library for making portable Emacs Lisp programs
 EAPI=6
 HOMEPAGE=http://cvs.m17n.org/elisp/APEL/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=ftp://ftp.jpl.org/pub/elisp/apel/apel-10.8.tar.gz https://dev.gentoo.org/~gienah/2big4tree/app-emacs/apel/apel-10.8-030_Use-new-style-backquotes.patch.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=c9035627e3cc773b4ed32b8b9e1e060b
diff --git a/metadata/md5-cache/app-emacs/apel-10.8_p20190407 b/metadata/md5-cache/app-emacs/apel-10.8_p20190407
index 11f210c80e6e..9691bf7dd9f7 100644
--- a/metadata/md5-cache/app-emacs/apel-10.8_p20190407
+++ b/metadata/md5-cache/app-emacs/apel-10.8_p20190407
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A Portable Emacs Library is a library for making portable Emacs Lisp programs
 EAPI=7
 HOMEPAGE=https://github.com/wanderlust/apel
+INHERIT=elisp
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/apel/archive/d146ddbf8818e81d3577d5eee7825d377bec0c73.tar.gz -> apel-10.8_p20190407.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=4be424453c9d846b4599113e886a2269
diff --git a/metadata/md5-cache/app-emacs/async-1.9.3 b/metadata/md5-cache/app-emacs/async-1.9.3
index a241530fe7c6..959b21237628 100644
--- a/metadata/md5-cache/app-emacs/async-1.9.3
+++ b/metadata/md5-cache/app-emacs/async-1.9.3
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Simple library for asynchronous processing in Emacs
 EAPI=7
 HOMEPAGE=https://github.com/jwiegley/emacs-async
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/jwiegley/emacs-async/archive/v1.9.3.tar.gz -> emacs-async-1.9.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=2ed0daef725b93c434757e0e443f51d2
diff --git a/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0 b/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0
index add0ed359045..048478a35167 100644
--- a/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0
+++ b/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0
@@ -3,10 +3,11 @@ DEPEND=app-emacs/websocket >=app-editors/emacs-25:*
 DESCRIPTION=Edit text area on Chrome with Emacs using Atomic Chrome
 EAPI=6
 HOMEPAGE=https://github.com/alpha22jp/atomic-chrome
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-emacs/websocket >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/alpha22jp/atomic-chrome/archive/v2.0.0.tar.gz -> atomic-chrome-2.0.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=05fb60580edb6036dc0dd7411f3e627c
diff --git a/metadata/md5-cache/app-emacs/auctex-11.92 b/metadata/md5-cache/app-emacs/auctex-11.92
index 509fbb600c0b..983d6dc93dee 100644
--- a/metadata/md5-cache/app-emacs/auctex-11.92
+++ b/metadata/md5-cache/app-emacs/auctex-11.92
@@ -3,11 +3,12 @@ DEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-
 DESCRIPTION=Extensible package for writing and formatting TeX files in Emacs
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/auctex/
+INHERIT=elisp
 IUSE=preview-latex
 KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-11.92.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=c92ca17c6883f54492f4f93aa05f924b
diff --git a/metadata/md5-cache/app-emacs/auctex-12.2 b/metadata/md5-cache/app-emacs/auctex-12.2
index 26cfeb4e58a5..e8aa89623eb1 100644
--- a/metadata/md5-cache/app-emacs/auctex-12.2
+++ b/metadata/md5-cache/app-emacs/auctex-12.2
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Extensible package for writing and formatting TeX files in Emacs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/auctex/
+INHERIT=elisp
 IUSE=preview-latex
 KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-12.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=3817cba598317249bc4d3e472ee31a78
diff --git a/metadata/md5-cache/app-emacs/auctex-12.3 b/metadata/md5-cache/app-emacs/auctex-12.3
index 476d8134acbc..c4589b0a8ec7 100644
--- a/metadata/md5-cache/app-emacs/auctex-12.3
+++ b/metadata/md5-cache/app-emacs/auctex-12.3
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Extensible package for writing and formatting TeX files in Emacs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/auctex/
+INHERIT=elisp
 IUSE=preview-latex
 KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-12.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=3817cba598317249bc4d3e472ee31a78
diff --git a/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r1 b/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r1
index 99daa9578890..62d27e42a34f 100644
--- a/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r1
+++ b/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Auto-complete package
 EAPI=7
 HOMEPAGE=https://github.com/auto-complete/auto-complete/
+INHERIT=elisp
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ FDL-1.1+
@@ -10,5 +11,5 @@ RDEPEND=app-emacs/popup >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/auto-complete/auto-complete/archive/v1.5.1.tar.gz -> auto-complete-1.5.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=93ff8c7110b0498fb6980bf946a39b5e
diff --git a/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1 b/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
index 29e02842b1cf..9d80f2c61392 100644
--- a/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
+++ b/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs major modes for editing autoconf and autotest input
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
+INHERIT=elisp
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=3641a6fd64edd376871f8beceb584204
diff --git a/metadata/md5-cache/app-emacs/basic-toolkit-0.7 b/metadata/md5-cache/app-emacs/basic-toolkit-0.7
index c6b5c54b348e..2d52315160aa 100644
--- a/metadata/md5-cache/app-emacs/basic-toolkit-0.7
+++ b/metadata/md5-cache/app-emacs/basic-toolkit-0.7
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Basic edit toolkit
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/basic-toolkit.el
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/windows app-emacs/cycle-buffer app-emacs/css-sort-buffer >=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/basic-toolkit-0.7.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=4d5de200e57a6627868ee77effd9530a
diff --git a/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2 b/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2
index f30e70fc0d83..8ca4b99d32ba 100644
--- a/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2
+++ b/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2
@@ -11,5 +11,5 @@ RDEPEND=vm? ( app-emacs/vm ) tex? ( virtual/tex-base ) >=app-editors/emacs-23.1:
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/bbdb/bbdb-3.1.2.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	elisp	00840e1f4eb277c757dbfa5abf73c4c7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=34f40f4aa226d6c2cbef933a1eba7cdf
diff --git a/metadata/md5-cache/app-emacs/bbdb-3.2_pre20180106 b/metadata/md5-cache/app-emacs/bbdb-3.2_pre20180106
index 5babfc5ad810..8ab5ee76f50c 100644
--- a/metadata/md5-cache/app-emacs/bbdb-3.2_pre20180106
+++ b/metadata/md5-cache/app-emacs/bbdb-3.2_pre20180106
@@ -11,5 +11,5 @@ RDEPEND=vm? ( app-emacs/vm ) tex? ( virtual/latex-base ) >=app-editors/emacs-23.
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/bbdb-3.2.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	elisp	00840e1f4eb277c757dbfa5abf73c4c7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=af9f92628406c7ccd0da3c19af6d0f3c
diff --git a/metadata/md5-cache/app-emacs/binclock-1.11 b/metadata/md5-cache/app-emacs/binclock-1.11
index bf76b1f1c3f5..a4fd66e7054e 100644
--- a/metadata/md5-cache/app-emacs/binclock-1.11
+++ b/metadata/md5-cache/app-emacs/binclock-1.11
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Display the current time using a binary clock
 EAPI=7
 HOMEPAGE=http://www.davep.org/emacs/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/binclock.el/archive/v1.11.tar.gz -> binclock-1.11.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=a3c3e964327bebdfd0a8740363237d8b
diff --git a/metadata/md5-cache/app-emacs/bison-mode-0.3 b/metadata/md5-cache/app-emacs/bison-mode-0.3
index 03b4bb206e7e..0a2442f1bf6d 100644
--- a/metadata/md5-cache/app-emacs/bison-mode-0.3
+++ b/metadata/md5-cache/app-emacs/bison-mode-0.3
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Emacs major mode for Bison, Yacc and Lex grammars
 EAPI=5
 HOMEPAGE=https://github.com/Wilfred/bison-mode
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~nicolasbock/bison-mode-0.3.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=f6114b331d83c9457c02563141761d21
diff --git a/metadata/md5-cache/app-emacs/blogmax-20170321 b/metadata/md5-cache/app-emacs/blogmax-20170321
index 74f9258e8bae..eb30c64ab7ff 100644
--- a/metadata/md5-cache/app-emacs/blogmax-20170321
+++ b/metadata/md5-cache/app-emacs/blogmax-20170321
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Blogging in Emacs
 EAPI=7
 HOMEPAGE=https://billstclair.com/blogmax/index.html
+INHERIT=elisp eutils readme.gentoo-r1
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-1+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/blogmax-20170321.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=171de8a465e5289d045eeb8fe7048cf0
diff --git a/metadata/md5-cache/app-emacs/bm-201905 b/metadata/md5-cache/app-emacs/bm-201905
index 68cff1d96512..8fea5002f8c6 100644
--- a/metadata/md5-cache/app-emacs/bm-201905
+++ b/metadata/md5-cache/app-emacs/bm-201905
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Visible bookmarks in buffer
 EAPI=7
 HOMEPAGE=http://joodland.github.io/bm/ https://www.emacswiki.org/emacs/VisibleBookmarks
+INHERIT=elisp
 KEYWORDS=amd64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/joodland/bm/archive/201905.tar.gz -> bm-201905.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=541265409ff659bffce3fc87a3de926f
diff --git a/metadata/md5-cache/app-emacs/bongo-1.1 b/metadata/md5-cache/app-emacs/bongo-1.1
index fc902698aeeb..72f54fabe743 100644
--- a/metadata/md5-cache/app-emacs/bongo-1.1
+++ b/metadata/md5-cache/app-emacs/bongo-1.1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Buffer-oriented media player for Emacs
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/Bongo
+INHERIT=elisp
 IUSE=mplayer
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=app-emacs/volume >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/dbrock/bongo/archive/1.1.tar.gz -> bongo-1.1.tar.gz mplayer? ( mirror://gentoo/bongo-mplayer-20070204.tar.bz2 )
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=71c654d9d1d75d8b68daa86b08e67684
diff --git a/metadata/md5-cache/app-emacs/boxquote-2.1 b/metadata/md5-cache/app-emacs/boxquote-2.1
index 96305d18a661..6fbddecc76ec 100644
--- a/metadata/md5-cache/app-emacs/boxquote-2.1
+++ b/metadata/md5-cache/app-emacs/boxquote-2.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Quote text with a semi-box
 EAPI=7
 HOMEPAGE=http://www.davep.org/emacs/
+INHERIT=elisp
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/boxquote.el/archive/v2.1.tar.gz -> boxquote-2.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=0979523451600bffd9967675c43ff5d5
diff --git a/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0 b/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0
index 5b2691a9c88b..e2f253bedee5 100644
--- a/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0
+++ b/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An improved interface to kill-ring
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/BrowseKillRing https://github.com/browse-kill-ring/browse-kill-ring
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/browse-kill-ring/browse-kill-ring/archive/2.0.0.tar.gz -> browse-kill-ring-2.0.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=e8cce377e266a6ecc29a5ea15aa18920
diff --git a/metadata/md5-cache/app-emacs/bubblet-0.74-r1 b/metadata/md5-cache/app-emacs/bubblet-0.74-r1
index 601b503bd089..6adc9adabcee 100644
--- a/metadata/md5-cache/app-emacs/bubblet-0.74-r1
+++ b/metadata/md5-cache/app-emacs/bubblet-0.74-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=A bubble-popping game
 EAPI=5
 HOMEPAGE=http://web.archive.org/web/20051217154122/www.gelatinous.com/pld/bubblet.html
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/bubblet-0.74.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=9d7df46d5874f4b531cd6b46ff4fc67f
diff --git a/metadata/md5-cache/app-emacs/buffer-extension-0.1 b/metadata/md5-cache/app-emacs/buffer-extension-0.1
index a64e38085b21..f3edf8d1f0bc 100644
--- a/metadata/md5-cache/app-emacs/buffer-extension-0.1
+++ b/metadata/md5-cache/app-emacs/buffer-extension-0.1
@@ -3,10 +3,11 @@ DEPEND=app-emacs/basic-toolkit >=app-editors/emacs-23.1:*
 DESCRIPTION=Some enhanced functions for buffer manipulate
 EAPI=6
 HOMEPAGE=https://www.emacswiki.org/emacs/buffer-extension.el
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/basic-toolkit >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/buffer-extension-0.1.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=07457a41901ad0dc5246beca8697283a
diff --git a/metadata/md5-cache/app-emacs/calfw-1.6 b/metadata/md5-cache/app-emacs/calfw-1.6
index b610f52385e5..cda28adf51cb 100644
--- a/metadata/md5-cache/app-emacs/calfw-1.6
+++ b/metadata/md5-cache/app-emacs/calfw-1.6
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A calendar framework for Emacs
 EAPI=7
 HOMEPAGE=https://github.com/kiwanami/emacs-calfw
+INHERIT=elisp
 IUSE=howm
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=howm? ( app-emacs/howm ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/kiwanami/emacs-calfw/archive/v1.6.tar.gz -> calfw-1.6.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=39c928de96cdb0ec10e4c0aa9b786aa2
diff --git a/metadata/md5-cache/app-emacs/chess-2.0.4 b/metadata/md5-cache/app-emacs/chess-2.0.4
index 9171b691fd7d..d0a2d7657401 100644
--- a/metadata/md5-cache/app-emacs/chess-2.0.4
+++ b/metadata/md5-cache/app-emacs/chess-2.0.4
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-24:*
 DESCRIPTION=A chess client and library for Emacs
 EAPI=5
 HOMEPAGE=https://elpa.gnu.org/packages/chess.html https://www.emacswiki.org/emacs/ChessMode
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=|| ( games-board/stockfish games-board/fruit games-board/gnuchess games-board/phalanx games-board/sjeng games-board/crafty ) >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/chess-2.0.4.tar.xz mirror://gentoo/emacs-chess-sounds-2.0.tar.bz2 mirror://gentoo/emacs-chess-pieces-2.0.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=2194ac6c05f7510540879af6ef8162af
diff --git a/metadata/md5-cache/app-emacs/circe-2.11 b/metadata/md5-cache/app-emacs/circe-2.11
index 29fadeb146ad..7cdd9739bee0 100644
--- a/metadata/md5-cache/app-emacs/circe-2.11
+++ b/metadata/md5-cache/app-emacs/circe-2.11
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A great IRC client for Emacs
 EAPI=7
 HOMEPAGE=https://github.com/jorgenschaefer/circe https://www.emacswiki.org/emacs/Circe
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/circe/archive/v2.11.tar.gz -> circe-2.11.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=1a20f4d913fa501c763de9d584c396e5
diff --git a/metadata/md5-cache/app-emacs/cldoc-1.16 b/metadata/md5-cache/app-emacs/cldoc-1.16
index 8de123c835b2..013363082fa2 100644
--- a/metadata/md5-cache/app-emacs/cldoc-1.16
+++ b/metadata/md5-cache/app-emacs/cldoc-1.16
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Show Common Lisp operators and variables information in echo area
 EAPI=5
 HOMEPAGE=http://homepage1.nifty.com/bmonkey/lisp/index-en.html
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-emacs/slime >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/cldoc-1.16.el.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=5649f4938b9311309d03cd39327db3fa
diff --git a/metadata/md5-cache/app-emacs/color-browser-0.3-r1 b/metadata/md5-cache/app-emacs/color-browser-0.3-r1
index 25653a4ef612..173a1ff3c8e8 100644
--- a/metadata/md5-cache/app-emacs/color-browser-0.3-r1
+++ b/metadata/md5-cache/app-emacs/color-browser-0.3-r1
@@ -3,10 +3,11 @@ DEPEND=app-emacs/color-theme >=app-editors/emacs-23.1:*
 DESCRIPTION=A utility for designing Emacs color themes
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/KahlilHodgson
+INHERIT=elisp
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-emacs/color-theme >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/color-browser-0.3.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=84f683ae4d80a8f1c9b7806d08654798
diff --git a/metadata/md5-cache/app-emacs/color-moccur-2.73 b/metadata/md5-cache/app-emacs/color-moccur-2.73
index 5dece8c76671..c20acf0b3c09 100644
--- a/metadata/md5-cache/app-emacs/color-moccur-2.73
+++ b/metadata/md5-cache/app-emacs/color-moccur-2.73
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Major mode for color moccur
 EAPI=5
 HOMEPAGE=http://www.bookshelf.jp/ https://www.emacswiki.org/emacs/SearchBuffers
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/color-moccur-2.73.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=88523ed9159a2dd28b347df8139b690c
diff --git a/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2 b/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2
index 244ca53f0b5c..b58ea3bff7ab 100644
--- a/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2
+++ b/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Install color themes (includes many themes)
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/color-theme/
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases-noredirect/color-theme/color-theme-6.6.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=bf5452351632191d7c2d8894eefe72bc
diff --git a/metadata/md5-cache/app-emacs/company-mode-0.9.10 b/metadata/md5-cache/app-emacs/company-mode-0.9.10
index 58c2eb1a3b25..60af1f29aaa9 100644
--- a/metadata/md5-cache/app-emacs/company-mode-0.9.10
+++ b/metadata/md5-cache/app-emacs/company-mode-0.9.10
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=In-buffer completion front-end
 EAPI=7
 HOMEPAGE=https://company-mode.github.com/
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/company-mode/company-mode/archive/0.9.10.tar.gz -> company-mode-0.9.10.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=5af3e35baf51c8199b30645ffe504d80
diff --git a/metadata/md5-cache/app-emacs/crontab-mode-1.20 b/metadata/md5-cache/app-emacs/crontab-mode-1.20
index c04b303a48e2..5464e548923a 100644
--- a/metadata/md5-cache/app-emacs/crontab-mode-1.20
+++ b/metadata/md5-cache/app-emacs/crontab-mode-1.20
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Mode for editing crontab files
 EAPI=5
 HOMEPAGE=http://www.mahalito.net/~harley/elisp/
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/crontab-mode-1.20.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=20eed63c32d49e35eff076b103006f65
diff --git a/metadata/md5-cache/app-emacs/crypt++-2.92 b/metadata/md5-cache/app-emacs/crypt++-2.92
index ed0f4fa10a92..6c43b373bfd9 100644
--- a/metadata/md5-cache/app-emacs/crypt++-2.92
+++ b/metadata/md5-cache/app-emacs/crypt++-2.92
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Handle all sorts of compressed and encrypted files
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/CryptPlusPlus
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/crypt++el/crypt++el_2.92.orig.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=4aed8484b69e882ca00d5dea4bd9a32f
diff --git a/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430 b/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
index 13c4be4e0fd1..ad9be4a299ad 100644
--- a/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
+++ b/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Handle all sorts of compressed and encrypted files
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/CryptPlusPlus
+INHERIT=elisp
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/crypt++-2.94_pre20080430.el.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=f58e55ff624a1d04965eea2ef384ec98
diff --git a/metadata/md5-cache/app-emacs/csharp-mode-0.9.2 b/metadata/md5-cache/app-emacs/csharp-mode-0.9.2
index 25c6ea4f6ac5..d0d8042e680c 100644
--- a/metadata/md5-cache/app-emacs/csharp-mode-0.9.2
+++ b/metadata/md5-cache/app-emacs/csharp-mode-0.9.2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A derived Emacs mode implementing most of the C# rules
 EAPI=7
 HOMEPAGE=https://github.com/josteink/csharp-mode
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/josteink/csharp-mode/archive/v0.9.2.tar.gz -> csharp-mode-0.9.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=41c54c7b6d88080fef94c04dbbbd1c89
diff --git a/metadata/md5-cache/app-emacs/css-mode-0.11-r1 b/metadata/md5-cache/app-emacs/css-mode-0.11-r1
index 7ab9b9048890..c8c4d53a91db 100644
--- a/metadata/md5-cache/app-emacs/css-mode-0.11-r1
+++ b/metadata/md5-cache/app-emacs/css-mode-0.11-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=A major mode for editing Cascading Style Sheets (CSS)
 EAPI=5
 HOMEPAGE=http://www.garshol.priv.no/download/software/css-mode/
+INHERIT=elisp
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/css-mode-0.11.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=89ff486baed97ce235dabc3f7c9f34a4
diff --git a/metadata/md5-cache/app-emacs/css-sort-buffer-0.2 b/metadata/md5-cache/app-emacs/css-sort-buffer-0.2
index e2d2898eeb88..48de2d5de0d2 100644
--- a/metadata/md5-cache/app-emacs/css-sort-buffer-0.2
+++ b/metadata/md5-cache/app-emacs/css-sort-buffer-0.2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Sort CSS buffer
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/css-sort-buffer.el
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/css-sort-buffer-0.2.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=93df5e2ff021985f8304f2f0efb5d616
diff --git a/metadata/md5-cache/app-emacs/csv-mode-1.10 b/metadata/md5-cache/app-emacs/csv-mode-1.10
index 26d5d341d82d..becdd6a671e8 100644
--- a/metadata/md5-cache/app-emacs/csv-mode-1.10
+++ b/metadata/md5-cache/app-emacs/csv-mode-1.10
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A major mode for editing comma-separated value files
 EAPI=7
 HOMEPAGE=https://elpa.gnu.org/packages/csv-mode.html https://www.emacswiki.org/emacs/CsvMode
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/csv-mode-1.10.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=390c7770be8167c2e1b4c5ccebd8179f
diff --git a/metadata/md5-cache/app-emacs/csv-mode-1.9 b/metadata/md5-cache/app-emacs/csv-mode-1.9
index 72d907cab3c2..96a68439f011 100644
--- a/metadata/md5-cache/app-emacs/csv-mode-1.9
+++ b/metadata/md5-cache/app-emacs/csv-mode-1.9
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A major mode for editing comma-separated value files
 EAPI=7
 HOMEPAGE=https://elpa.gnu.org/packages/csv-mode.html https://www.emacswiki.org/emacs/CsvMode
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/csv-mode-1.9.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=fbca9c115ea539557a6410fd7bbdd9d0
diff --git a/metadata/md5-cache/app-emacs/cycle-buffer-2.16 b/metadata/md5-cache/app-emacs/cycle-buffer-2.16
index 2fa7340a5193..700c813db976 100644
--- a/metadata/md5-cache/app-emacs/cycle-buffer-2.16
+++ b/metadata/md5-cache/app-emacs/cycle-buffer-2.16
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Select buffer by cycling through
 EAPI=6
 HOMEPAGE=https://www.emacswiki.org/emacs/cycle-buffer.el
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/cycle-buffer-2.16.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=fba97e86a9b234e1f601a7ab8c34c249
diff --git a/metadata/md5-cache/app-emacs/d-mode-2.0.10 b/metadata/md5-cache/app-emacs/d-mode-2.0.10
index 0d52b1fcc38c..8b4318094c30 100644
--- a/metadata/md5-cache/app-emacs/d-mode-2.0.10
+++ b/metadata/md5-cache/app-emacs/d-mode-2.0.10
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs major mode for editing D code
 EAPI=7
 HOMEPAGE=https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode https://www.emacswiki.org/emacs/DMode
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/2.0.10.tar.gz -> d-mode-2.0.10.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=1ce20f9973ed6636c74609c0b60f2fbb
diff --git a/metadata/md5-cache/app-emacs/dash-2.14.1 b/metadata/md5-cache/app-emacs/dash-2.14.1
index 7db8ac663279..3b8d0be2406e 100644
--- a/metadata/md5-cache/app-emacs/dash-2.14.1
+++ b/metadata/md5-cache/app-emacs/dash-2.14.1
@@ -3,10 +3,11 @@ DEPEND=sys-apps/texinfo >=app-editors/emacs-23.1:*
 DESCRIPTION=A modern list library for Emacs
 EAPI=6
 HOMEPAGE=https://github.com/magnars/dash.el
+INHERIT=elisp
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.14.1.tar.gz -> dash-2.14.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=f775e581389901d9e3137fc4b9c9a1ba
diff --git a/metadata/md5-cache/app-emacs/dash-2.16.0 b/metadata/md5-cache/app-emacs/dash-2.16.0
index 62311ddfc498..fa4c9977c17d 100644
--- a/metadata/md5-cache/app-emacs/dash-2.16.0
+++ b/metadata/md5-cache/app-emacs/dash-2.16.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpa
 DESCRIPTION=A modern list library for Emacs
 EAPI=7
 HOMEPAGE=https://github.com/magnars/dash.el
+INHERIT=elisp
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.16.0.tar.gz -> dash-2.16.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=458cece7a89bda772136ecc61d30aedb
diff --git a/metadata/md5-cache/app-emacs/dash-2.17.0 b/metadata/md5-cache/app-emacs/dash-2.17.0
index b3f87c516371..77c5b85790d0 100644
--- a/metadata/md5-cache/app-emacs/dash-2.17.0
+++ b/metadata/md5-cache/app-emacs/dash-2.17.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpa
 DESCRIPTION=A modern list library for Emacs
 EAPI=7
 HOMEPAGE=https://github.com/magnars/dash.el
+INHERIT=elisp
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.17.0.tar.gz -> dash-2.17.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=51060b3b02c2aa75f2835128c6baceec
diff --git a/metadata/md5-cache/app-emacs/ddskk-16.2 b/metadata/md5-cache/app-emacs/ddskk-16.2
index 3791e7a2a6ea..85e547975bb0 100644
--- a/metadata/md5-cache/app-emacs/ddskk-16.2
+++ b/metadata/md5-cache/app-emacs/ddskk-16.2
@@ -3,6 +3,7 @@ DEPEND=>=app-editors/emacs-24:*
 DESCRIPTION=One Japanese input methods on Emacs
 EAPI=6
 HOMEPAGE=http://openlab.ring.gr.jp/skk/
+INHERIT=elisp ruby-single
 IUSE=ruby
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.6
 RESTRICT=test
 SLOT=0
 SRC_URI=http://openlab.ring.gr.jp/skk/maintrunk/ddskk-16.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-single	e6530f43a549f120f9396ccb852288f5
 _md5_=19d7cd4e6f64e86b219b6d048ead2d15
diff --git a/metadata/md5-cache/app-emacs/ddskk-16.3 b/metadata/md5-cache/app-emacs/ddskk-16.3
index 1dc24dc46dbd..8a8eb342f5e7 100644
--- a/metadata/md5-cache/app-emacs/ddskk-16.3
+++ b/metadata/md5-cache/app-emacs/ddskk-16.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=One Japanese input methods on Emacs
 EAPI=7
 HOMEPAGE=http://openlab.ring.gr.jp/skk/
+INHERIT=elisp ruby-single vcs-snapshot
 IUSE=ruby
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
@@ -10,5 +11,5 @@ RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.6
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/skk-dev/ddskk/archive/ddskk-16.3_Kutomatsunai.tar.gz -> ddskk-16.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-single	e6530f43a549f120f9396ccb852288f5	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=2cf515e4d0bce249f4e218d02ad3711f
diff --git a/metadata/md5-cache/app-emacs/ddskk-17.1 b/metadata/md5-cache/app-emacs/ddskk-17.1
index 4add5d75e2a1..e96a853c1e8d 100644
--- a/metadata/md5-cache/app-emacs/ddskk-17.1
+++ b/metadata/md5-cache/app-emacs/ddskk-17.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=One Japanese input methods on Emacs
 EAPI=7
 HOMEPAGE=http://openlab.ring.gr.jp/skk/
+INHERIT=elisp ruby-single vcs-snapshot
 IUSE=ruby
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
@@ -10,5 +11,5 @@ RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.6
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/skk-dev/ddskk/archive/ddskk-17.1_Neppu.tar.gz -> ddskk-17.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-single	e6530f43a549f120f9396ccb852288f5	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=68e6f9bad37891f7b53d2a4666614a2c
diff --git a/metadata/md5-cache/app-emacs/desktop+-0.2-r2 b/metadata/md5-cache/app-emacs/desktop+-0.2-r2
index ea79ed9fba05..7208759a0a30 100644
--- a/metadata/md5-cache/app-emacs/desktop+-0.2-r2
+++ b/metadata/md5-cache/app-emacs/desktop+-0.2-r2
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=desktop+ extends standard desktop module
 EAPI=7
 HOMEPAGE=https://github.com/ffevotte/desktop-plus
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/dash app-emacs/f >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ffevotte/desktop-plus/archive/v0.2.tar.gz -> desktop+-0.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=098794d4cd6c17343c24ddd702f19e63
diff --git a/metadata/md5-cache/app-emacs/develock-0.47 b/metadata/md5-cache/app-emacs/develock-0.47
index 438d93d4958c..7705e05ab988 100644
--- a/metadata/md5-cache/app-emacs/develock-0.47
+++ b/metadata/md5-cache/app-emacs/develock-0.47
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Emacs minor mode for highlighting broken formatting rules
 EAPI=7
 HOMEPAGE=https://www.jpl.org/ftp/pub/elisp/ https://www.emacswiki.org/emacs/DevelockMode
+INHERIT=elisp
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/develock-0.47.el.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=25f6146ad67bb6e1a6b95e860bae5925
diff --git a/metadata/md5-cache/app-emacs/df-mode-20050509-r1 b/metadata/md5-cache/app-emacs/df-mode-20050509-r1
index 0d3a40e57697..f4a0408544b4 100644
--- a/metadata/md5-cache/app-emacs/df-mode-20050509-r1
+++ b/metadata/md5-cache/app-emacs/df-mode-20050509-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Minor mode to show space left on devices in the mode line
 EAPI=7
 HOMEPAGE=https://web.archive.org/web/20061001221337/http://www.coli.uni-saarland.de/~fouvry/software.html https://www.emacswiki.org/emacs/DfMode
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/df-mode-20050509.el.bz2
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=9d0cfa22df387422eb3c3b3c23065f41
diff --git a/metadata/md5-cache/app-emacs/dictionary-1.10 b/metadata/md5-cache/app-emacs/dictionary-1.10
index f534e7140f60..04ac8e25c3bd 100644
--- a/metadata/md5-cache/app-emacs/dictionary-1.10
+++ b/metadata/md5-cache/app-emacs/dictionary-1.10
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Emacs package for talking to a dictionary server
 EAPI=5
 HOMEPAGE=http://www.myrkr.in-berlin.de/dictionary/index.html
+INHERIT=elisp
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.myrkr.in-berlin.de/dictionary/dictionary-1.10.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=654aab74f3e37cd0b430041f780f3458
diff --git a/metadata/md5-cache/app-emacs/dircolors-1.0-r2 b/metadata/md5-cache/app-emacs/dircolors-1.0-r2
index 8f8f2d30adc5..b6d0ae673c16 100644
--- a/metadata/md5-cache/app-emacs/dircolors-1.0-r2
+++ b/metadata/md5-cache/app-emacs/dircolors-1.0-r2
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Provide the same facility of ls --color inside Emacs
 EAPI=5
 HOMEPAGE=http://lfs.irisa.fr/~pad/rawaccess.query/hacks/dircolors.el
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/dircolors-1.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=2de18fcb85da42b9fb3efca31f87f378
diff --git a/metadata/md5-cache/app-emacs/dired-sort-menu-1.26 b/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
index 3f1f93f566f1..9c09a7b2b916 100644
--- a/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
+++ b/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Sort entries in Dired mode
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/DiredSortMenu
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/dired-sort-menu-1.26.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=d253ae322ac667913331ea69c50b19aa
diff --git a/metadata/md5-cache/app-emacs/distel-4.1.1 b/metadata/md5-cache/app-emacs/distel-4.1.1
index f96b1484acce..336334e13fa3 100644
--- a/metadata/md5-cache/app-emacs/distel-4.1.1
+++ b/metadata/md5-cache/app-emacs/distel-4.1.1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Distributed Emacs Lisp for Erlang
 EAPI=7
 HOMEPAGE=https://massemanet.github.io/distel/ https://www.emacswiki.org/emacs/DistributedEmacsLisp
+INHERIT=elisp
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD MIT
 RDEPEND=>=dev-lang/erlang-11.2.5[emacs] >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/massemanet/distel/archive/4.1.1.tar.gz -> distel-4.1.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=8bbad2669cec464d5be5b9ed3114bc73
diff --git a/metadata/md5-cache/app-emacs/doctest-mode-0.4 b/metadata/md5-cache/app-emacs/doctest-mode-0.4
index f3f7c38aa4d1..7d3c0ebb482e 100644
--- a/metadata/md5-cache/app-emacs/doctest-mode-0.4
+++ b/metadata/md5-cache/app-emacs/doctest-mode-0.4
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=An Emacs major mode for editing Python source
 EAPI=5
 HOMEPAGE=http://ed.loper.org/projects/doctestmode/
+INHERIT=elisp
 KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86
 LICENSE=HPND
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://python-mode.svn.sourceforge.net/viewvc/*checkout*/python-mode/trunk/python-mode/doctest-mode.el?revision=460 -> doctest-mode.el
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=61a5a91b891177738e1f766809665387
diff --git a/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3 b/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
index 53ef66bc0d85..195cf57ca4ae 100644
--- a/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
+++ b/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
@@ -3,10 +3,11 @@ DEPEND=>=dev-libs/libxml2-2.6.13 >=app-editors/emacs-23.1:*
 DESCRIPTION=Doxygen editing minor mode
 EAPI=5
 HOMEPAGE=http://doxymacs.sourceforge.net/
+INHERIT=elisp flag-o-matic
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/libxml2-2.6.13 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/doxymacs/doxymacs-1.8.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=5a343760d9dc6d77e002778fda24e094
diff --git a/metadata/md5-cache/app-emacs/dropdown-list-20120329 b/metadata/md5-cache/app-emacs/dropdown-list-20120329
index fa80852402a2..7760afef9532 100644
--- a/metadata/md5-cache/app-emacs/dropdown-list-20120329
+++ b/metadata/md5-cache/app-emacs/dropdown-list-20120329
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Drop-down menu interface
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/dropdown-list.el
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/dropdown-list-20120329.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=0402d6ca62dc7d6393838b65203682bb
diff --git a/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103 b/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103
index 2812f9cf667c..550a3591266e 100644
--- a/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103
+++ b/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs major mode for devicetree sources
 EAPI=7
 HOMEPAGE=https://github.com/bgamari/dts-mode
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/bgamari/dts-mode/archive/9ee0854446dcc6c53d2b8d2941051768dba50344.tar.gz -> dts-mode-0.1.0_pre20161103.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=e8b695cc744fac577ee31bc10b1aff7b
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3 b/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
index 641cba497c47..4a58e8920dee 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.51.tar.xz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=fd6c5048bc3e0150e4440b356959034f
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.52 b/metadata/md5-cache/app-emacs/ebuild-mode-1.52
index f87d668a5d83..cef89b1fb2fc 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.52
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.52
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.52.tar.xz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=0ef662e7420c21e39fb6366ee01efa2e
diff --git a/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728 b/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
index 572aa9958960..96b37a5f6a0e 100644
--- a/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
+++ b/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
@@ -4,11 +4,12 @@ DEPEND=java? ( app-emacs/jde )
 DESCRIPTION=Source code browser for Emacs
 EAPI=7
 HOMEPAGE=http://ecb.sourceforge.net/
+INHERIT=elisp readme.gentoo-r1
 IUSE=java
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=java? ( app-emacs/jde ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ecb-2.50_pre20170728.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=b1043286115f9c52bc14b28009a706a8
diff --git a/metadata/md5-cache/app-emacs/edb-1.32 b/metadata/md5-cache/app-emacs/edb-1.32
index 6b43264f5209..7dde36a48ba3 100644
--- a/metadata/md5-cache/app-emacs/edb-1.32
+++ b/metadata/md5-cache/app-emacs/edb-1.32
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=EDB, The Emacs Database
 EAPI=6
 HOMEPAGE=http://www.gnuvola.org/software/edb/ https://www.emacswiki.org/emacs/EmacsDataBase
+INHERIT=elisp
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-3+ Texinfo-manual
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.gnuvola.org/software/edb/edb-1.32.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=5685dde303cd36eb202869f846564224
diff --git a/metadata/md5-cache/app-emacs/edit-list-0.3 b/metadata/md5-cache/app-emacs/edit-list-0.3
index a4d59edadd62..29eaa16b5150 100644
--- a/metadata/md5-cache/app-emacs/edit-list-0.3
+++ b/metadata/md5-cache/app-emacs/edit-list-0.3
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Edit a single list
 EAPI=5
 HOMEPAGE=http://mwolson.org/projects/
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/edit-list-0.3.el.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=5d539a6ee458ce78acfc32033f419aba
diff --git a/metadata/md5-cache/app-emacs/edit-server-1.15 b/metadata/md5-cache/app-emacs/edit-server-1.15
index 1e2d1e72bd57..65ad7f08fa59 100644
--- a/metadata/md5-cache/app-emacs/edit-server-1.15
+++ b/metadata/md5-cache/app-emacs/edit-server-1.15
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Service edit requests from a web browser for editing of textareas
 EAPI=7
 HOMEPAGE=https://github.com/stsquad/emacs_chrome
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/stsquad/emacs_chrome/archive/v1.15.tar.gz -> emacs_chrome-1.15.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=c4ba721291f40f8820688ec4f7d711c4
diff --git a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1 b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1
index e3a0189ce56f..361ec54df380 100644
--- a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1
+++ b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=EditorConfig plugin for emacs
 EAPI=7
 HOMEPAGE=https://github.com/editorconfig/editorconfig-emacs
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-emacs/archive/v0.7.8.tar.gz -> editorconfig-emacs-0.7.8.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=ab4acc1125badd8a54276903d4f6b1a4
diff --git a/metadata/md5-cache/app-emacs/elscreen-20180321 b/metadata/md5-cache/app-emacs/elscreen-20180321
index 1ff713f6cf87..4ec6ae5e4eb4 100644
--- a/metadata/md5-cache/app-emacs/elscreen-20180321
+++ b/metadata/md5-cache/app-emacs/elscreen-20180321
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Frame configuration management for GNU Emacs modelled after GNU Screen
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/EmacsLispScreen https://github.com/knu/elscreen
+INHERIT=elisp
 IUSE=wanderlust
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=wanderlust? ( app-emacs/wanderlust ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/knu/elscreen/archive/20180321.tar.gz -> elscreen-20180321.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=762284baff9387cb5cc2ccad2a046618
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r4 b/metadata/md5-cache/app-emacs/emacs-common-1.6-r4
index c93b96de5d63..911cbb10603a 100644
--- a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r4
+++ b/metadata/md5-cache/app-emacs/emacs-common-1.6-r4
@@ -3,6 +3,7 @@ DEPEND=games? ( acct-group/gamestat )
 DESCRIPTION=Common files needed by all GNU Emacs versions
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+INHERIT=elisp-common desktop xdg-utils readme.gentoo-r1
 IUSE=games gui
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+
@@ -10,5 +11,5 @@ PDEPEND=>=app-editors/emacs-23.1:*
 RDEPEND=games? ( acct-group/gamestat )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.6.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd85dccae19bff25a58ecc0b74dde460
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=756f98c41607124b6376ede1d0b09e4a
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.7 b/metadata/md5-cache/app-emacs/emacs-common-1.8
index 3bd1b0e66c2c..e1a6be14202c 100644
--- a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.7
+++ b/metadata/md5-cache/app-emacs/emacs-common-1.8
@@ -3,12 +3,13 @@ DEPEND=games? ( acct-group/gamestat )
 DESCRIPTION=Common files needed by all GNU Emacs versions
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+INHERIT=elisp-common desktop xdg-utils readme.gentoo-r1
 IUSE=games gui
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+
 PDEPEND=>=app-editors/emacs-23.1:*
 RDEPEND=games? ( acct-group/gamestat )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.7.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-1.8.tar.xz
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=b36dce4dd963aadebd09c1744fba20fb
diff --git a/metadata/md5-cache/app-emacs/emacs-daemon-0.22 b/metadata/md5-cache/app-emacs/emacs-daemon-0.22
index 05252ab46e58..df1f11f31198 100644
--- a/metadata/md5-cache/app-emacs/emacs-daemon-0.22
+++ b/metadata/md5-cache/app-emacs/emacs-daemon-0.22
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Gentoo support for Emacs running as a server in the background
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+INHERIT=elisp
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-daemon-0.22.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=a202f1787793953c6d9579a3e5930cb6
diff --git a/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92 b/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
index 7ed3474c95cf..8fdf1c038eb6 100644
--- a/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
+++ b/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
@@ -3,10 +3,11 @@ DEPEND=app-emacs/hexrgb sys-apps/texinfo >=app-editors/emacs-23.1:*
 DESCRIPTION=A Jabber client for Emacs
 EAPI=5
 HOMEPAGE=http://emacs-jabber.sourceforge.net/ https://www.emacswiki.org/emacs/JabberEl
+INHERIT=elisp
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-emacs/hexrgb >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-jabber/emacs-jabber-0.8.92.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=245c6dc4f9563e577abbe8fa01a8d4e9
diff --git a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518 b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518
index 7ba89dc92c20..665f3ed8df30 100644
--- a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518
+++ b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/w3m >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.625_pre20180518.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	elisp	00840e1f4eb277c757dbfa5abf73c4c7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=331fda058d6dacfcfd2ee6828fcde124
diff --git a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112 b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112
index 7d82365eb53e..bd483b9f9757 100644
--- a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112
+++ b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/w3m >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.632_pre20181112.tar.xz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	elisp	00840e1f4eb277c757dbfa5abf73c4c7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=bb29eb789e50daec73b475684b35cdbb
diff --git a/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1 b/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
index 4f1b8e0bc77a..6b148cffeccb 100644
--- a/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
+++ b/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
@@ -3,11 +3,12 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Wget interface for Emacs
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/EmacsWget
+INHERIT=elisp
 IUSE=l10n_ja
 KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=net-misc/wget-1.8.2 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/emacs-wget-0.5.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=d95f91854b868334687c51a06925ee56
diff --git a/metadata/md5-cache/app-emacs/emhacks-20070920-r1 b/metadata/md5-cache/app-emacs/emhacks-20070920-r1
index 144c4e9e43b9..abd006f40dbb 100644
--- a/metadata/md5-cache/app-emacs/emhacks-20070920-r1
+++ b/metadata/md5-cache/app-emacs/emhacks-20070920-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Useful Emacs Lisp libraries, including gdiff, jjar, jmaker, swbuff, and tabbar
 EAPI=6
 HOMEPAGE=http://emhacks.sourceforge.net/
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emhacks-20070920.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=2865aeb84bbd72d2a7ca214d2e7fd99c
diff --git a/metadata/md5-cache/app-emacs/emms-4.4 b/metadata/md5-cache/app-emacs/emms-4.4
index 36dbc22b20ad..881f48d3c99b 100644
--- a/metadata/md5-cache/app-emacs/emms-4.4
+++ b/metadata/md5-cache/app-emacs/emms-4.4
@@ -3,10 +3,11 @@ DEPEND=media-libs/taglib >=app-editors/emacs-23.1:*
 DESCRIPTION=The Emacs Multimedia System
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emms/ https://www.emacswiki.org/emacs/EMMS
+INHERIT=elisp toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-4.4.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=54092665f9aa757d6ebcc23c74c88c5d
diff --git a/metadata/md5-cache/app-emacs/emms-5.3 b/metadata/md5-cache/app-emacs/emms-5.3
index ffb3a10baf22..e296f18a23b0 100644
--- a/metadata/md5-cache/app-emacs/emms-5.3
+++ b/metadata/md5-cache/app-emacs/emms-5.3
@@ -4,10 +4,11 @@ DEPEND=media-libs/taglib
 DESCRIPTION=The Emacs Multimedia System
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emms/ https://www.emacswiki.org/emacs/EMMS
+INHERIT=elisp toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-5.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=321e45cc837fb4ed684c5b5a82a45298
diff --git a/metadata/md5-cache/app-emacs/emms-5.4 b/metadata/md5-cache/app-emacs/emms-5.4
index 6d49c7436b29..40ace71bbd68 100644
--- a/metadata/md5-cache/app-emacs/emms-5.4
+++ b/metadata/md5-cache/app-emacs/emms-5.4
@@ -4,10 +4,11 @@ DEPEND=media-libs/taglib
 DESCRIPTION=The Emacs Multimedia System
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emms/ https://www.emacswiki.org/emacs/EMMS
+INHERIT=elisp toolchain-funcs
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-5.4.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=321e45cc837fb4ed684c5b5a82a45298
diff --git a/metadata/md5-cache/app-emacs/erobot-2.1.0-r1 b/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
index fdc0ae88b29d..78f85ac3b68b 100644
--- a/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
+++ b/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Battle-bots for Emacs!
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/EmacsRobots
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/erobot-2.1.0.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=bd274dd6ad0e51c0cb0e24f9bc36b80c
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.16 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.16
index 941ee91516ab..af3c9a73e120 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.4.16
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.16
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Emacs major mode for editing eselect files
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
+INHERIT=elisp
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.16.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=97abe50ac0d24e0d59895d4139d0e4ab
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.17 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.17
index 5c1dbcbe837a..1b78da63b1a1 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.4.17
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.17
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs major mode for editing eselect files
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
+INHERIT=elisp
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.17.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=8afd14519584bd232057c33bd5c7cb28
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-9999 b/metadata/md5-cache/app-emacs/eselect-mode-9999
index b55900404870..4a8fe27b5a07 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-9999
+++ b/metadata/md5-cache/app-emacs/eselect-mode-9999
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs major mode for editing eselect files
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
+INHERIT=elisp git-r3
 LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=e3d3c03f5ad385a9a46cf8471acaee5c
diff --git a/metadata/md5-cache/app-emacs/ess-17.11 b/metadata/md5-cache/app-emacs/ess-17.11
index 83caa2c01ba9..c928c5fe361e 100644
--- a/metadata/md5-cache/app-emacs/ess-17.11
+++ b/metadata/md5-cache/app-emacs/ess-17.11
@@ -3,11 +3,12 @@ DEPEND=app-text/texi2html virtual/latex-base >=app-editors/emacs-23.1:*
 DESCRIPTION=Emacs Speaks Statistics
 EAPI=6
 HOMEPAGE=http://ess.r-project.org/
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ GPL-3+ Texinfo-manual
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ess.r-project.org/downloads/ess/ess-17.11.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=25de9ed07de3f95fce0d458e58a8917f
diff --git a/metadata/md5-cache/app-emacs/ess-18.10.2-r1 b/metadata/md5-cache/app-emacs/ess-18.10.2-r1
index f58849030e2b..eda6dc1d9b11 100644
--- a/metadata/md5-cache/app-emacs/ess-18.10.2-r1
+++ b/metadata/md5-cache/app-emacs/ess-18.10.2-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs Speaks Statistics
 EAPI=7
 HOMEPAGE=http://ess.r-project.org/
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ GPL-3+ Texinfo-manual
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ess.r-project.org/downloads/ess/ess-18.10.2.tgz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=1f546bec99b4b01298804660683a5c22
diff --git a/metadata/md5-cache/app-emacs/evil-1.2.13 b/metadata/md5-cache/app-emacs/evil-1.2.13
index 2d9fd94b7c41..82026d9548a0 100644
--- a/metadata/md5-cache/app-emacs/evil-1.2.13
+++ b/metadata/md5-cache/app-emacs/evil-1.2.13
@@ -3,11 +3,12 @@ DEPEND=>=app-emacs/undo-tree-0.6.3 sys-apps/texinfo >=app-editors/emacs-23.1:*
 DESCRIPTION=Extensible vi layer for Emacs
 EAPI=6
 HOMEPAGE=https://github.com/emacs-evil/evil
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=>=app-emacs/undo-tree-0.6.3 >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-evil/evil/archive/1.2.13.tar.gz -> evil-1.2.13.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=cf4fe8499d75f5ee43402a425835058f
diff --git a/metadata/md5-cache/app-emacs/evil-1.2.14 b/metadata/md5-cache/app-emacs/evil-1.2.14
index 745939e225ec..fe2852654e5f 100644
--- a/metadata/md5-cache/app-emacs/evil-1.2.14
+++ b/metadata/md5-cache/app-emacs/evil-1.2.14
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Extensible vi layer for Emacs
 EAPI=7
 HOMEPAGE=https://github.com/emacs-evil/evil
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=>=app-emacs/undo-tree-0.6.3 >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-evil/evil/archive/1.2.14.tar.gz -> evil-1.2.14.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=e497eea5defd958116fc79cf46e2a8f8
diff --git a/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1 b/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1
index 1999d0ca44a9..5eb62ef99164 100644
--- a/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1
+++ b/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs extension to increase selected region by semantic units
 EAPI=7
 HOMEPAGE=https://github.com/magnars/expand-region.el
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/expand-region.el/archive/0.11.0.tar.gz -> expand-region-0.11.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=4177c3f6403c66872818d877654d51b6
diff --git a/metadata/md5-cache/app-emacs/f-0.19.0 b/metadata/md5-cache/app-emacs/f-0.19.0
index 0206a3c8e957..efb2539d8004 100644
--- a/metadata/md5-cache/app-emacs/f-0.19.0
+++ b/metadata/md5-cache/app-emacs/f-0.19.0
@@ -3,11 +3,12 @@ DEPEND=app-emacs/dash app-emacs/s >=app-editors/emacs-23.1:*
 DESCRIPTION=Modern API for working with files and directories in Emacs
 EAPI=6
 HOMEPAGE=https://github.com/rejeep/f.el
+INHERIT=elisp
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/dash app-emacs/s >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/f.el/archive/v0.19.0.tar.gz -> f-0.19.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=a82585d652930b74b5bbb53c08fdb962
diff --git a/metadata/md5-cache/app-emacs/f-0.20.0 b/metadata/md5-cache/app-emacs/f-0.20.0
index 5563ca56c53e..8c25a64eea98 100644
--- a/metadata/md5-cache/app-emacs/f-0.20.0
+++ b/metadata/md5-cache/app-emacs/f-0.20.0
@@ -3,11 +3,12 @@ DEPEND=app-emacs/dash app-emacs/s >=app-editors/emacs-23.1:*
 DESCRIPTION=Modern API for working with files and directories in Emacs
 EAPI=6
 HOMEPAGE=https://github.com/rejeep/f.el
+INHERIT=elisp
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/dash app-emacs/s >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/f.el/archive/v0.20.0.tar.gz -> f-0.20.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=e9d8d9b47c8b24b034cd3bf476daf766
diff --git a/metadata/md5-cache/app-emacs/fff-20050517 b/metadata/md5-cache/app-emacs/fff-20050517
index 724292dbd3bf..0221b991b074 100644
--- a/metadata/md5-cache/app-emacs/fff-20050517
+++ b/metadata/md5-cache/app-emacs/fff-20050517
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Fast file finder for Emacs
 EAPI=5
 HOMEPAGE=http://www.splode.com/~friedman/software/emacs-lisp/
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=sys-apps/mlocate >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/fff-20050517.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=12b1675b84a5227ea8320a27133f2636
diff --git a/metadata/md5-cache/app-emacs/filladapt-2.12-r1 b/metadata/md5-cache/app-emacs/filladapt-2.12-r1
index ce9eb435b107..6d785c36669d 100644
--- a/metadata/md5-cache/app-emacs/filladapt-2.12-r1
+++ b/metadata/md5-cache/app-emacs/filladapt-2.12-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Filladapt enhances the behavior of Emacs' fill functions
 EAPI=5
 HOMEPAGE=http://www.wonderworks.com/
+INHERIT=readme.gentoo elisp
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/filladapt-2.12.el.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=3e584814ec6d6ce5d55baa51e8c0d862
diff --git a/metadata/md5-cache/app-emacs/flashcard-2.3.3 b/metadata/md5-cache/app-emacs/flashcard-2.3.3
index 89b0370505f3..a383544a6ef3 100644
--- a/metadata/md5-cache/app-emacs/flashcard-2.3.3
+++ b/metadata/md5-cache/app-emacs/flashcard-2.3.3
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=An Emacs Lisp package for drilling on questions and answers
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/FlashCard
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/flashcard-2.3.3.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=cf43d3d1026844c736a52a42505b7d97
diff --git a/metadata/md5-cache/app-emacs/flim-1.14.9-r2 b/metadata/md5-cache/app-emacs/flim-1.14.9-r2
index 0166fd5a620b..db9e4c0c692d 100644
--- a/metadata/md5-cache/app-emacs/flim-1.14.9-r2
+++ b/metadata/md5-cache/app-emacs/flim-1.14.9-r2
@@ -3,10 +3,11 @@ DEPEND=>=app-emacs/apel-10.3 >=app-editors/emacs-23.1:*
 DESCRIPTION=A library to provide basic features about message representation or encoding
 EAPI=5
 HOMEPAGE=http://git.chise.org/elisp/flim/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.3 !app-emacs/limit >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://git.chise.org/elisp/dist/flim/flim-1.14/flim-1.14.9.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=1dfaa751bda797bd8303423dbcc5d0ae
diff --git a/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526 b/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
index 755f854a50a1..d19508bbcaf6 100644
--- a/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
+++ b/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
@@ -4,10 +4,11 @@ DEPEND=>=app-emacs/apel-10.8
 DESCRIPTION=A library to provide basic features about message representation or encoding
 EAPI=7
 HOMEPAGE=https://github.com/wanderlust/flim
+INHERIT=elisp
 KEYWORDS=~alpha amd64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 !app-emacs/limit >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/flim/archive/e4bd54fd7d335215b54f7ef27ed974c8cd68d472.tar.gz -> flim-1.14.9_p20190526.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=401271afbbb18129864cca51bf6efb38
diff --git a/metadata/md5-cache/app-emacs/folding-2019.0524.1621 b/metadata/md5-cache/app-emacs/folding-2019.0524.1621
index d2d59e8dbaa6..49a874e3ee7b 100644
--- a/metadata/md5-cache/app-emacs/folding-2019.0524.1621
+++ b/metadata/md5-cache/app-emacs/folding-2019.0524.1621
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A folding-editor-like Emacs minor mode
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/FoldingMode
+INHERIT=elisp
 KEYWORDS=~alpha amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/jaalto/project-emacs--folding-mode/archive/a1361aa154b27bd4db2e1cfe6c3b81b4fc1fdc9a.tar.gz -> folding-2019.0524.1621.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=5bfed2527b21ef3c903362f80c4906ec
diff --git a/metadata/md5-cache/app-emacs/ghub-3.2.0 b/metadata/md5-cache/app-emacs/ghub-3.2.0
index 5ca5db39a319..3c88ec9c5a18 100644
--- a/metadata/md5-cache/app-emacs/ghub-3.2.0
+++ b/metadata/md5-cache/app-emacs/ghub-3.2.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Minuscule client library for the Git forge APIs
 EAPI=7
 HOMEPAGE=https://magit.vc/manual/ghub
+INHERIT=elisp
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/graphql-0.1.1 >=app-emacs/treepy-0.0.1 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v3.2.0.tar.gz -> ghub-3.2.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=33b47790302bd8a5bcf7ba2fbdd845c6
diff --git a/metadata/md5-cache/app-emacs/ghub-3.3.0 b/metadata/md5-cache/app-emacs/ghub-3.3.0
index 4d5d35f692e2..e6f81105f205 100644
--- a/metadata/md5-cache/app-emacs/ghub-3.3.0
+++ b/metadata/md5-cache/app-emacs/ghub-3.3.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Minuscule client library for the Git forge APIs
 EAPI=7
 HOMEPAGE=https://magit.vc/manual/ghub
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-emacs/treepy-0.1.1 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v3.3.0.tar.gz -> ghub-3.3.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=a88314f3dcd67b88efc826df90cd0afd
diff --git a/metadata/md5-cache/app-emacs/ghub-3.4.1 b/metadata/md5-cache/app-emacs/ghub-3.4.1
index bf953a1de673..07342cdad2c6 100644
--- a/metadata/md5-cache/app-emacs/ghub-3.4.1
+++ b/metadata/md5-cache/app-emacs/ghub-3.4.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Minuscule client library for the Git forge APIs
 EAPI=7
 HOMEPAGE=https://magit.vc/manual/ghub
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-emacs/treepy-0.1.1 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v3.4.1.tar.gz -> ghub-3.4.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=a88314f3dcd67b88efc826df90cd0afd
diff --git a/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0 b/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
index da178e1ba98f..f2b291d7b77f 100644
--- a/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
+++ b/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
@@ -3,11 +3,12 @@ DEPEND=doc? ( virtual/latex-base ) >=app-editors/emacs-23.1:*
 DESCRIPTION=Gnuplot mode for Emacs
 EAPI=5
 HOMEPAGE=http://xafs.org/BruceRavel/GnuplotMode
+INHERIT=readme.gentoo elisp
 IUSE=doc
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=sci-visualization/gnuplot[-emacs(-)] >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/bruceravel/gnuplot-mode/archive/0.7.0.tar.gz -> gnuplot-mode-0.7.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=9a754f791d24d81214863b9c5908beb7
diff --git a/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5 b/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5
index 1725b0f03c14..7a6666ac4796 100644
--- a/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5
+++ b/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5
@@ -4,11 +4,12 @@ DEPEND=>=app-eselect/eselect-emacs-1.15 X? ( x11-libs/libXau ) X? ( x11-base/xor
 DESCRIPTION=Attach to an already running Emacs
 EAPI=7
 HOMEPAGE=http://meltin.net/hacks/emacs/
+INHERIT=elisp multilib desktop xdg-utils
 IUSE=X
 KEYWORDS=amd64 ~ppc x86 ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-eselect/eselect-emacs-1.15 X? ( x11-libs/libXau ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://meltin.net/hacks/emacs/src/gnuserv-3.12.8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7588f0ca0ffa2911b82800f33795f858
diff --git a/metadata/md5-cache/app-emacs/go-mode-1.5.0 b/metadata/md5-cache/app-emacs/go-mode-1.5.0
index 6624d3851b90..711b0ed5c872 100644
--- a/metadata/md5-cache/app-emacs/go-mode-1.5.0
+++ b/metadata/md5-cache/app-emacs/go-mode-1.5.0
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=An improved Go mode for emacs
 EAPI=6
 HOMEPAGE=https://github.com/dominikh/go-mode.el
+INHERIT=elisp
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/dominikh/go-mode.el/archive/v1.5.0.tar.gz -> go-mode-1.5.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=1db9b6722e79d0fb313dd9baeddba9a9
diff --git a/metadata/md5-cache/app-emacs/google-c-style-20140929 b/metadata/md5-cache/app-emacs/google-c-style-20140929
index af5b6c577ecb..bfd0d474ed18 100644
--- a/metadata/md5-cache/app-emacs/google-c-style-20140929
+++ b/metadata/md5-cache/app-emacs/google-c-style-20140929
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Provides the google C/C++ coding style
 EAPI=7
 HOMEPAGE=https://github.com/google/styleguide
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/google-c-style-20140929.el.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=10e1327d7989e968aa4cbf0e692fb9b2
diff --git a/metadata/md5-cache/app-emacs/graphql-0.1.1 b/metadata/md5-cache/app-emacs/graphql-0.1.1
index 98fca7d84dd0..5f201559252b 100644
--- a/metadata/md5-cache/app-emacs/graphql-0.1.1
+++ b/metadata/md5-cache/app-emacs/graphql-0.1.1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=GraphQL utilities
 EAPI=7
 HOMEPAGE=https://github.com/vermiculus/graphql.el
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vermiculus/graphql.el/archive/0.1.1.tar.gz -> graphql-0.1.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=213055d4f50aa71cc25333214677bbc0
diff --git a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4 b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4
index 408715648074..be6773ea8f2d 100644
--- a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4
+++ b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs mode for editing and previewing Graphviz dot graphs
 EAPI=7
 HOMEPAGE=http://users.skynet.be/ppareit/projects/graphviz-dot-mode/graphviz-dot-mode.html https://github.com/ppareit/graphviz-dot-mode http://www.graphviz.org/
+INHERIT=elisp
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ppareit/graphviz-dot-mode/archive/v0.4.tar.gz -> graphviz-dot-mode-0.4.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=7b0fcfa9a7f0aa959a9ee262ecc7a306
diff --git a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118 b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118
index de6eac771d0a..4b0844557a82 100644
--- a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118
+++ b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs mode for editing and previewing Graphviz dot graphs
 EAPI=7
 HOMEPAGE=http://users.skynet.be/ppareit/projects/graphviz-dot-mode/graphviz-dot-mode.html https://github.com/ppareit/graphviz-dot-mode https://www.graphviz.org/
+INHERIT=elisp
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ppareit/graphviz-dot-mode/archive/243de72e09ddd5cdc4863613af8b749827a5e1cd.tar.gz -> graphviz-dot-mode-0.4.20181118.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=9c0190d653c5ef147a1e76149558a263
diff --git a/metadata/md5-cache/app-emacs/h4x0r-0.13-r1 b/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
index accf788e2598..3ef466b8185b 100644
--- a/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
+++ b/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Aid in writing like a script kiddie does
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/EliteSpeech
+INHERIT=elisp
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/h4x0r-0.13.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=154d6ed2afbea3ca7ec1a1582157717c
diff --git a/metadata/md5-cache/app-emacs/haskell-mode-16.1 b/metadata/md5-cache/app-emacs/haskell-mode-16.1
index 40978fffd7b1..c6ba63e8f9c9 100644
--- a/metadata/md5-cache/app-emacs/haskell-mode-16.1
+++ b/metadata/md5-cache/app-emacs/haskell-mode-16.1
@@ -3,10 +3,11 @@ DEPEND=sys-apps/texinfo >=app-editors/emacs-23.1:*
 DESCRIPTION=Mode for editing (and running) Haskell programs in Emacs
 EAPI=6
 HOMEPAGE=https://haskell.github.io/haskell-mode/ https://www.haskell.org/haskellwiki/Emacs#Haskell-mode
+INHERIT=elisp
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-3+ FDL-1.2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/haskell/haskell-mode/archive/v16.1.tar.gz -> haskell-mode-16.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=52cdf0da16f2cfc559feedabf27e11db
diff --git a/metadata/md5-cache/app-emacs/helm-3.2 b/metadata/md5-cache/app-emacs/helm-3.2
index 3ec3f1014b9d..eeda71d67ea6 100644
--- a/metadata/md5-cache/app-emacs/helm-3.2
+++ b/metadata/md5-cache/app-emacs/helm-3.2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs incremental completion and selection narrowing framework
 EAPI=7
 HOMEPAGE=https://emacs-helm.github.io/helm/
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/async app-emacs/popup >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm/archive/v3.2.tar.gz -> helm-3.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=069fa9b9a48ec7137d162fd2debcbedb
diff --git a/metadata/md5-cache/app-emacs/helm-3.6.0 b/metadata/md5-cache/app-emacs/helm-3.6.0
index 8492090d94c9..576b616f4011 100644
--- a/metadata/md5-cache/app-emacs/helm-3.6.0
+++ b/metadata/md5-cache/app-emacs/helm-3.6.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs incremental completion and selection narrowing framework
 EAPI=7
 HOMEPAGE=https://emacs-helm.github.io/helm/
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/async app-emacs/popup >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm/archive/v3.6.0.tar.gz -> helm-3.6.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=069fa9b9a48ec7137d162fd2debcbedb
diff --git a/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1 b/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1
index 33c774317678..9aa434bede62 100644
--- a/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1
+++ b/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A Helm interface to the package manager of your operating system
 EAPI=7
 HOMEPAGE=https://github.com/emacs-helm/helm-system-packages
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/helm >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm-system-packages/archive/v1.10.1.tar.gz -> helm-system-packages-1.10.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=6f546d7e5e02da8bd885b0f6d354c7fe
diff --git a/metadata/md5-cache/app-emacs/hexrgb-0_p1019 b/metadata/md5-cache/app-emacs/hexrgb-0_p1019
index 916a1411a3b6..23ff5761adc2 100644
--- a/metadata/md5-cache/app-emacs/hexrgb-0_p1019
+++ b/metadata/md5-cache/app-emacs/hexrgb-0_p1019
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Functions to manipulate colors, including RGB hex strings
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/hexrgb.el
+INHERIT=elisp
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/hexrgb-0_p1019.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=18e63a7ffc3d28dc8bfa50a432aeb73c
diff --git a/metadata/md5-cache/app-emacs/highline-7.2.2 b/metadata/md5-cache/app-emacs/highline-7.2.2
index cc5821b1118f..46cd096ac518 100644
--- a/metadata/md5-cache/app-emacs/highline-7.2.2
+++ b/metadata/md5-cache/app-emacs/highline-7.2.2
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Minor mode to highlight current line in buffer
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/HighlineMode
+INHERIT=elisp
 KEYWORDS=amd64 ppc ~s390 ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/highline-7.2.2.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=434a1916e32a755710525e4c42dea979
diff --git a/metadata/md5-cache/app-emacs/howm-1.4.5 b/metadata/md5-cache/app-emacs/howm-1.4.5
index e9481c2382a8..02d33d566e51 100644
--- a/metadata/md5-cache/app-emacs/howm-1.4.5
+++ b/metadata/md5-cache/app-emacs/howm-1.4.5
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Note-taking tool on Emacs
 EAPI=7
 HOMEPAGE=https://howm.sourceforge.jp/
+INHERIT=elisp
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-1+ GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://howm.sourceforge.jp/a/howm-1.4.5.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=62be48057c4c7105d16dadd69c26a138
diff --git a/metadata/md5-cache/app-emacs/htmlize-1.54 b/metadata/md5-cache/app-emacs/htmlize-1.54
index 48ee2e98a13f..349eeeb86075 100644
--- a/metadata/md5-cache/app-emacs/htmlize-1.54
+++ b/metadata/md5-cache/app-emacs/htmlize-1.54
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=HTML-ize font-lock buffers in Emacs
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/Htmlize https://github.com/hniksic/emacs-htmlize
+INHERIT=elisp
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/hniksic/emacs-htmlize/archive/release/1.54.tar.gz -> htmlize-1.54.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=0b42b8ecd2069cfbcfd43fe66040af45
diff --git a/metadata/md5-cache/app-emacs/htmlize-1.55 b/metadata/md5-cache/app-emacs/htmlize-1.55
index e5af91827a89..41019a04c49f 100644
--- a/metadata/md5-cache/app-emacs/htmlize-1.55
+++ b/metadata/md5-cache/app-emacs/htmlize-1.55
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=HTML-ize font-lock buffers in Emacs
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/Htmlize https://github.com/hniksic/emacs-htmlize
+INHERIT=elisp
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/hniksic/emacs-htmlize/archive/release/1.55.tar.gz -> htmlize-1.55.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=579775b743a32685d3eb2ddcb2b96c23
diff --git a/metadata/md5-cache/app-emacs/httpd-1.1 b/metadata/md5-cache/app-emacs/httpd-1.1
index 74bb5462a3e5..b819f6620cb4 100644
--- a/metadata/md5-cache/app-emacs/httpd-1.1
+++ b/metadata/md5-cache/app-emacs/httpd-1.1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=A HTTP server embedded in the Emacs
 EAPI=5
 HOMEPAGE=http://www.chez.com/emarsden/downloads/
+INHERIT=elisp
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/httpd-1.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=aaf120d14a436b709ffe81a3c3e7806b
diff --git a/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733 b/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733
index 77aaf125b884..3f29f3fd3f0b 100644
--- a/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733
+++ b/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Minibuffer input completion and cycling
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/Icicles
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/icicles-2018.02.13.23733.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=2d73a2a1b120177c8ca359abc399f902
diff --git a/metadata/md5-cache/app-emacs/igrep-2.113 b/metadata/md5-cache/app-emacs/igrep-2.113
index 163dcee142ae..a1598ab67db3 100644
--- a/metadata/md5-cache/app-emacs/igrep-2.113
+++ b/metadata/md5-cache/app-emacs/igrep-2.113
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=An improved interface to "grep" and "find"
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/GrepMode
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/igrep-2.113.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=2b6be75021c3acb0ce6c42aac099a505
diff --git a/metadata/md5-cache/app-emacs/inform-mode-1.6.2 b/metadata/md5-cache/app-emacs/inform-mode-1.6.2
index a05404bd099d..b5d9ee434be0 100644
--- a/metadata/md5-cache/app-emacs/inform-mode-1.6.2
+++ b/metadata/md5-cache/app-emacs/inform-mode-1.6.2
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=A major mode for editing Inform programs
 EAPI=5
 HOMEPAGE=https://www.rupert-lane.org/inform-mode/ https://www.emacswiki.org/emacs/InformMode
+INHERIT=elisp
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://rupert-lane.org/inform-mode/releases/inform-mode-1.6.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=d38e1be22b8a7ad411327d9df3fa0373
diff --git a/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919 b/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919
index b2400b791eb5..26a01bc687bc 100644
--- a/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919
+++ b/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Split customizations into different files
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/InitSplit
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/dabrahams/initsplit/archive/c941d436eb2b10b01c76a582c5a2b23fb30751aa.tar.gz -> initsplit-1.8_pre20160919.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=9bd99c5892d24e3013e6b9ebc7d8f86a
diff --git a/metadata/md5-cache/app-emacs/jam-mode-0.3 b/metadata/md5-cache/app-emacs/jam-mode-0.3
index 8418e82a1dd9..6a918a625139 100644
--- a/metadata/md5-cache/app-emacs/jam-mode-0.3
+++ b/metadata/md5-cache/app-emacs/jam-mode-0.3
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=An Emacs major mode for editing Jam files
 EAPI=5
 HOMEPAGE=https://web.archive.org/web/20100211015821/http://www.tenfoot.org.uk/index.html
+INHERIT=elisp
 KEYWORDS=~alpha amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/jam-mode-0.3.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=aed99181c263f94b1200d414ae39e0b3
diff --git a/metadata/md5-cache/app-emacs/jasmin-1.2-r2 b/metadata/md5-cache/app-emacs/jasmin-1.2-r2
index c16578ca3c06..ee7c5af7b88c 100644
--- a/metadata/md5-cache/app-emacs/jasmin-1.2-r2
+++ b/metadata/md5-cache/app-emacs/jasmin-1.2-r2
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=An Emacs major mode for editing Jasmin Java bytecode assembler files
 EAPI=5
 HOMEPAGE=http://www.neilvandyke.org/jasmin-emacs/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 ~s390 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/jasmin-1.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=634d2e0eaf0c28176e51b40e43966c3c
diff --git a/metadata/md5-cache/app-emacs/jde-2.4.1-r1 b/metadata/md5-cache/app-emacs/jde-2.4.1-r1
index fa4a2981aa97..52ef9db45363 100644
--- a/metadata/md5-cache/app-emacs/jde-2.4.1-r1
+++ b/metadata/md5-cache/app-emacs/jde-2.4.1-r1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.3:= dev-java/bsh:0 dev-java/junit:0 dev-util/checkstyle:0
 DESCRIPTION=Java Development Environment for Emacs
 EAPI=6
 HOMEPAGE=http://jdee.sourceforge.net/
+INHERIT=java-pkg-2 java-ant-2 elisp
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=>=virtual/jdk-1.3:= dev-java/bsh:0 dev-java/junit:0 dev-util/checkstyle:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/jdee-2.4.1.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-ant-2	fb9e1462d72ecaf7c91ae1d169606d9f	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=7325589340def371aed01bb5bf4bdc07
diff --git a/metadata/md5-cache/app-emacs/keywiz-1.4 b/metadata/md5-cache/app-emacs/keywiz-1.4
index 9ea028934530..fdb079e42064 100644
--- a/metadata/md5-cache/app-emacs/keywiz-1.4
+++ b/metadata/md5-cache/app-emacs/keywiz-1.4
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Emacs key sequence quiz
 EAPI=5
 HOMEPAGE=http://www.phys.au.dk/~harder/
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/keywiz-1.4.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=4da1db7778a8decef98ca926f9c9fc7a
diff --git a/metadata/md5-cache/app-emacs/ledger-mode-3.1.1 b/metadata/md5-cache/app-emacs/ledger-mode-3.1.1
index 28ebd9d5041f..d801d8f02cbd 100644
--- a/metadata/md5-cache/app-emacs/ledger-mode-3.1.1
+++ b/metadata/md5-cache/app-emacs/ledger-mode-3.1.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Emacs major mode for editing ledger files
 EAPI=7
 HOMEPAGE=https://github.com/ledger/ledger-mode
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ BSD
 RDEPEND=!<app-office/ledger-3.1.2[emacs(-)] >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger-mode/archive/v3.1.1.tar.gz -> ledger-mode-3.1.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=ed80baa66e1aac1716bf72854d6e0bca
diff --git a/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209 b/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
index f24137e396e4..da756214a850 100644
--- a/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
+++ b/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/lookup2/lookup2/archive/c4f4986aac6c339e03b9e56a5dfc7c8f5c0bb5e0.tar.gz -> lookup-1.99.96_pre20180209.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	elisp	00840e1f4eb277c757dbfa5abf73c4c7
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=c43429b01f078f24a86c9009de00d3f9
diff --git a/metadata/md5-cache/app-emacs/lua-mode-20151025 b/metadata/md5-cache/app-emacs/lua-mode-20151025
index aae08c4cd13b..84339e66becb 100644
--- a/metadata/md5-cache/app-emacs/lua-mode-20151025
+++ b/metadata/md5-cache/app-emacs/lua-mode-20151025
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Emacs major mode for editing Lua scripts
 EAPI=7
 HOMEPAGE=http://lua-users.org/wiki/LuaEditorSupport http://immerrr.github.io/lua-mode/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/immerrr/lua-mode/archive/rel-20151025.tar.gz -> lua-mode-20151025.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=f05d4ac70ef0a405b90ae9b822d8bb91
diff --git a/metadata/md5-cache/app-emacs/lua-mode-20201010 b/metadata/md5-cache/app-emacs/lua-mode-20201010
index 26e35890eadb..3465289cc954 100644
--- a/metadata/md5-cache/app-emacs/lua-mode-20201010
+++ b/metadata/md5-cache/app-emacs/lua-mode-20201010
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Emacs major mode for editing Lua scripts
 EAPI=7
 HOMEPAGE=http://lua-users.org/wiki/LuaEditorSupport http://immerrr.github.io/lua-mode/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-24.3:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/immerrr/lua-mode/archive/v20201010.tar.gz -> lua-mode-20201010.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=a1d9845466590f6dd8a11badfcb047d8
diff --git a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410 b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410
index a8a3e623462e..2939ffaa7331 100644
--- a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410
+++ b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Elisp client for the LysKOM conference system
 EAPI=7
 HOMEPAGE=http://www.lysator.liu.se/lyskom/klienter/emacslisp/index.en.html
+INHERIT=elisp readme.gentoo-r1
 IUSE=l10n_sv
 KEYWORDS=amd64 sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/lyskom-elisp-client-0.48_p20180410.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=97854fe50c3d057a2498b86c1ada7c20
diff --git a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226 b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226
index df6ef6ce829c..fcec377b746d 100644
--- a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226
+++ b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Elisp client for the LysKOM conference system
 EAPI=7
 HOMEPAGE=http://www.lysator.liu.se/lyskom/klienter/emacslisp/index.en.html
+INHERIT=elisp readme.gentoo-r1
 IUSE=l10n_sv
 KEYWORDS=amd64 sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/lyskom-elisp-client-0.48_p20200226.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=b15870b18fbaed430a25e9ea31a7a9c1
diff --git a/metadata/md5-cache/app-emacs/magit-2.13.1 b/metadata/md5-cache/app-emacs/magit-2.13.1
index 60ca9693a8ec..c749ab6c342f 100644
--- a/metadata/md5-cache/app-emacs/magit-2.13.1
+++ b/metadata/md5-cache/app-emacs/magit-2.13.1
@@ -3,10 +3,11 @@ DEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/ghub-2.0.1 >=app-emacs/magit-popup-2.
 DESCRIPTION=A Git porcelain inside Emacs
 EAPI=6
 HOMEPAGE=https://magit.vc/
+INHERIT=elisp
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/ghub-2.0.1 >=app-emacs/magit-popup-2.12.3 >=app-emacs/with-editor-2.7.3 >=dev-vcs/git-1.9.4 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/2.13.1.tar.gz -> magit-2.13.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=026fb69525df745b6e7c38a104561eae
diff --git a/metadata/md5-cache/app-emacs/magit-2.90.1 b/metadata/md5-cache/app-emacs/magit-2.90.1
index c357d9ef2aa8..39fdf635522b 100644
--- a/metadata/md5-cache/app-emacs/magit-2.90.1
+++ b/metadata/md5-cache/app-emacs/magit-2.90.1
@@ -3,10 +3,11 @@ DEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/ghub-3.0.0 >=app-emacs/magit-popup-2.
 DESCRIPTION=A Git porcelain inside Emacs
 EAPI=6
 HOMEPAGE=https://magit.vc/
+INHERIT=elisp
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/ghub-3.0.0 >=app-emacs/magit-popup-2.12.4 >=app-emacs/with-editor-2.8.0 >=dev-vcs/git-2.0.0 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/v2.90.1.tar.gz -> magit-2.90.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=c6db5d55a19e32db8e2d576e4135361f
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.13.0 b/metadata/md5-cache/app-emacs/magit-popup-2.13.0
index f945e2f3e962..58248e690605 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.13.0
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.13.0
@@ -4,10 +4,11 @@ DEPEND=>=app-emacs/dash-2.13.0 sys-apps/texinfo
 DESCRIPTION=Define prefix-infix-suffix command combos
 EAPI=7
 HOMEPAGE=https://magit.vc/manual/magit-popup
+INHERIT=elisp
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.13.0.tar.gz -> magit-popup-2.13.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=e3460323affd0fa1e6ab63f2505e6667
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.13.2 b/metadata/md5-cache/app-emacs/magit-popup-2.13.2
index cb725c2c7b2b..cf195f603bed 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.13.2
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.13.2
@@ -4,10 +4,11 @@ DEPEND=>=app-emacs/dash-2.13.0 sys-apps/texinfo
 DESCRIPTION=Define prefix-infix-suffix command combos
 EAPI=7
 HOMEPAGE=https://magit.vc/manual/magit-popup
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.13.2.tar.gz -> magit-popup-2.13.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=61109e2d12c420d2ade271242509419c
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.13.3 b/metadata/md5-cache/app-emacs/magit-popup-2.13.3
index 627aae88492e..ef146a5cc3a6 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.13.3
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.13.3
@@ -4,10 +4,11 @@ DEPEND=>=app-emacs/dash-2.13.0 sys-apps/texinfo
 DESCRIPTION=Define prefix-infix-suffix command combos
 EAPI=7
 HOMEPAGE=https://magit.vc/manual/magit-popup
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.13.3.tar.gz -> magit-popup-2.13.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=61109e2d12c420d2ade271242509419c
diff --git a/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3 b/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3
index 3e4cef6bc370..a5295e48b900 100644
--- a/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3
+++ b/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Provides a simple interface to public key cryptography with OpenPGP
 EAPI=7
 HOMEPAGE=http://mailcrypt.sourceforge.net/
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/mailcrypt/mailcrypt-3.5.9.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=003c00bc5653fc28d86fb246b9bc0087
diff --git a/metadata/md5-cache/app-emacs/markdown-mode-2.3 b/metadata/md5-cache/app-emacs/markdown-mode-2.3
index 6e653ed724fb..b5c81b99a930 100644
--- a/metadata/md5-cache/app-emacs/markdown-mode-2.3
+++ b/metadata/md5-cache/app-emacs/markdown-mode-2.3
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Major mode for editing Markdown-formatted text files
 EAPI=5
 HOMEPAGE=https://jblevins.org/projects/markdown-mode/
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=|| ( dev-python/markdown2 dev-python/markdown ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://stable.melpa.org/packages/markdown-mode-2.3.el
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=96d0d55530ff13324b9c7f17e18a4047
diff --git a/metadata/md5-cache/app-emacs/markdown-mode-2.4 b/metadata/md5-cache/app-emacs/markdown-mode-2.4
index eb12b5b895be..15b913c40f7d 100644
--- a/metadata/md5-cache/app-emacs/markdown-mode-2.4
+++ b/metadata/md5-cache/app-emacs/markdown-mode-2.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Major mode for editing Markdown-formatted text files
 EAPI=7
 HOMEPAGE=https://jblevins.org/projects/markdown-mode/
+INHERIT=elisp
 IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
@@ -10,5 +11,5 @@ RDEPEND=|| ( app-text/pandoc dev-python/markdown2 dev-python/markdown ) >=app-ed
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jrblevin/markdown-mode/archive/v2.4.tar.gz -> markdown-mode-2.4.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=f98b28880e33311e54928c6812057dd1
diff --git a/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1 b/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1
index 54d74da06433..953f11acfee2 100644
--- a/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1
+++ b/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Major modes for MATLAB .m and .tlc files
 EAPI=7
 HOMEPAGE=http://matlab-emacs.sourceforge.net/
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/matlab-3.3.6_pre20191010.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=225702323d3fcdd936ee74eb9bf45622
diff --git a/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1 b/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1
index a979ac0060f0..6f9cd965cd12 100644
--- a/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1
+++ b/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=MediaWiki client for Emacs
 EAPI=7
 HOMEPAGE=https://github.com/hexmode/mediawiki-el
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/hexmode/mediawiki-el/archive/2.2.9.tar.gz -> mediawiki-2.2.9.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=46a2f5056f47c4217b4f197fe05133f8
diff --git a/metadata/md5-cache/app-emacs/meson-mode-0.3 b/metadata/md5-cache/app-emacs/meson-mode-0.3
index bcd4d154f06f..e4c25828147f 100644
--- a/metadata/md5-cache/app-emacs/meson-mode-0.3
+++ b/metadata/md5-cache/app-emacs/meson-mode-0.3
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A GNU Emacs major mode for Meson build-system files
 EAPI=7
 HOMEPAGE=https://github.com/wentasah/meson-mode
+INHERIT=elisp
 KEYWORDS=~amd64
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://github.com/wentasah/meson-mode/archive/v0.3.tar.gz -> meson-mode-0.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=762dd03dc975deaa49a76880d8af6994
diff --git a/metadata/md5-cache/app-emacs/mew-6.8 b/metadata/md5-cache/app-emacs/mew-6.8
index 6811b64c4232..e8a1dca1de1d 100644
--- a/metadata/md5-cache/app-emacs/mew-6.8
+++ b/metadata/md5-cache/app-emacs/mew-6.8
@@ -4,6 +4,7 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Great MIME mail reader for Emacs/XEmacs
 EAPI=7
 HOMEPAGE=https://www.mew.org/
+INHERIT=elisp readme.gentoo-r1
 IUSE=ssl l10n_ja
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD
@@ -11,5 +12,5 @@ RDEPEND=sys-libs/zlib ssl? ( net-misc/stunnel ) >=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mew.org/Release/mew-6.8.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=b9d852272c81696f968287068ff7f5b4
diff --git a/metadata/md5-cache/app-emacs/mic-paren-3.11 b/metadata/md5-cache/app-emacs/mic-paren-3.11
index 97819ce050ef..cfe536c62e1f 100644
--- a/metadata/md5-cache/app-emacs/mic-paren-3.11
+++ b/metadata/md5-cache/app-emacs/mic-paren-3.11
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Advanced highlighting of matching parentheses
 EAPI=5
 HOMEPAGE=http://www.gnuvola.org/software/j/mic-paren/ https://www.emacswiki.org/emacs/MicParen
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/mic-paren-3.11.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=6502c441b1513c0ce29e69f2fa12da11
diff --git a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2 b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2
index be5a36315b7d..af3e9b2a2053 100644
--- a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2
+++ b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Emacs Lisp interface to the MLDonkey core
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/MlDonkey http://web.archive.org/web/20070107165326/www.physik.fu-berlin.de/~dhansen/mldonkey/
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/mldonkey-el-0.0.4b.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=f58cfa15ef884640381e9a4c3b586859
diff --git a/metadata/md5-cache/app-emacs/mmm-mode-0.5.7 b/metadata/md5-cache/app-emacs/mmm-mode-0.5.7
index f7201a359b4d..1f7461a3fb43 100644
--- a/metadata/md5-cache/app-emacs/mmm-mode-0.5.7
+++ b/metadata/md5-cache/app-emacs/mmm-mode-0.5.7
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Enables the user to edit different parts of a file in different major modes
 EAPI=7
 HOMEPAGE=http://mmm-mode.sourceforge.net/
+INHERIT=elisp
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/purcell/mmm-mode/archive/0.5.7.tar.gz -> mmm-mode-0.5.7.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=c1273665a04e2ca2496d4b4ed3d17237
diff --git a/metadata/md5-cache/app-emacs/moccur-edit-2.16 b/metadata/md5-cache/app-emacs/moccur-edit-2.16
index b04c564e6cd1..d1811e3995ee 100644
--- a/metadata/md5-cache/app-emacs/moccur-edit-2.16
+++ b/metadata/md5-cache/app-emacs/moccur-edit-2.16
@@ -3,10 +3,11 @@ DEPEND=app-emacs/color-moccur >=app-editors/emacs-23.1:*
 DESCRIPTION=An improved interface to color-moccur for editing
 EAPI=5
 HOMEPAGE=http://www.bookshelf.jp/ https://www.emacswiki.org/emacs/SearchBuffers
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/color-moccur >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/moccur-edit-2.16.el.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=04a639edb97b622a0a18b219bd50febe
diff --git a/metadata/md5-cache/app-emacs/mpg123-el-1.60 b/metadata/md5-cache/app-emacs/mpg123-el-1.60
index 67dc5a3e1611..5c48de31d9ec 100644
--- a/metadata/md5-cache/app-emacs/mpg123-el-1.60
+++ b/metadata/md5-cache/app-emacs/mpg123-el-1.60
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Emacs front-end to mpg123 audio player and OggVorbis audio player
 EAPI=6
 HOMEPAGE=http://www.gentei.org/~yuuji/software/mpg123el/
+INHERIT=elisp toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=mpg123-el
 RDEPEND=media-sound/mpg123 media-sound/alsa-utils >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mpg123-el-1.60.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=0b28df859f73c204843901b9bcf057d2
diff --git a/metadata/md5-cache/app-emacs/mpg123-el-1.61 b/metadata/md5-cache/app-emacs/mpg123-el-1.61
index 49dd68e5c70a..b4dc0f46bd1f 100644
--- a/metadata/md5-cache/app-emacs/mpg123-el-1.61
+++ b/metadata/md5-cache/app-emacs/mpg123-el-1.61
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs front-end to mpg123 audio player and OggVorbis audio player
 EAPI=7
 HOMEPAGE=http://www.gentei.org/~yuuji/software/mpg123el/
+INHERIT=elisp toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=mpg123-el
 RDEPEND=media-sound/mpg123 media-sound/alsa-utils >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mpg123-el-1.61.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=c2df5a5d31240af5a83095b6ff566981
diff --git a/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348 b/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348
index 21c6c614e1ec..8c4dc78b6306 100644
--- a/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348
+++ b/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348
@@ -4,11 +4,12 @@ DEPEND=app-emacs/apel app-emacs/flim bbdb? ( app-emacs/bbdb )
 DESCRIPTION=Message citation utilities for emacsen
 EAPI=7
 HOMEPAGE=https://www.jpl.org/elips/mu/
+INHERIT=elisp
 IUSE=bbdb
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-emacs/apel app-emacs/flim bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://www.jpl.org/elips/mu/snapshots/mu-cite-201808232348.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=50589a3d4fa464af68770f11e71966df
diff --git a/metadata/md5-cache/app-emacs/multi-term-1.4 b/metadata/md5-cache/app-emacs/multi-term-1.4
index 60eb72297871..798e8cc6bcea 100644
--- a/metadata/md5-cache/app-emacs/multi-term-1.4
+++ b/metadata/md5-cache/app-emacs/multi-term-1.4
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Manage multiple terminal buffers in Emacs
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/MultiTerm
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mjo/distfiles/multi-term-1.4.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=e0636cae5b688bed903cf4e016f717c1
diff --git a/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0 b/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0
index ba3d9e98f307..4b6d8595a103 100644
--- a/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0
+++ b/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Multiple cursors for Emacs
 EAPI=7
 HOMEPAGE=https://github.com/magnars/multiple-cursors.el
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/multiple-cursors.el/archive/1.4.0.tar.gz -> multiple-cursors-1.4.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=19934ddda2983416e762476782a23ddd
diff --git a/metadata/md5-cache/app-emacs/muse-3.20-r1 b/metadata/md5-cache/app-emacs/muse-3.20-r1
index b844c1b70310..5eaa54d5aaa0 100644
--- a/metadata/md5-cache/app-emacs/muse-3.20-r1
+++ b/metadata/md5-cache/app-emacs/muse-3.20-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An authoring and publishing environment for Emacs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs-muse/
+INHERIT=elisp
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3+ FDL-1.2+ GPL-2 MIT
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/alexott/muse/archive/v3.20.tar.gz -> muse-3.20.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=a5bc15f35110be375d19b1f58ba9679f
diff --git a/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1 b/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1
index 9a27187d21b1..4b255a76bcfd 100644
--- a/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1
+++ b/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Major mode for editing Nagios configuration files
 EAPI=7
 HOMEPAGE=http://michael.orlitzky.com/code/nagios-mode.php
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/nagios-mode-0.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=8f82a0892d0d20fd4f85f28c83b33440
diff --git a/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1 b/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1
index 03f65f354fcd..c19a47a34153 100644
--- a/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1
+++ b/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=A navigator for the Japanese textboard 2ch
 EAPI=6
 HOMEPAGE=http://navi2ch.sourceforge.net/
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/navi2ch/navi2ch-1.8.4.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=359774a25ee966f5690be38cc758152a
diff --git a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0 b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0
index 9e0f2b857aac..9ec231044d1e 100644
--- a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0
+++ b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Add support for DocBook 5 schemas to NXML
 EAPI=7
 HOMEPAGE=https://docbook.org/schemas/5x.html
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=HPND
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://docbook.org/xml/5.0/rng/docbookxi.rnc -> docbookxi-5.0.rnc
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=719e1af9bd0b431db9e5af672913bd04
diff --git a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1 b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1
index bd412698ec86..2db00ad6b9cb 100644
--- a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1
+++ b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Add support for DocBook 5 schemas to NXML
 EAPI=7
 HOMEPAGE=https://docbook.org/schemas/5x.html
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=HPND
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://docbook.org/xml/5.1/rng/docbookxi.rnc -> docbookxi-5.1.rnc
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=719e1af9bd0b431db9e5af672913bd04
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20200303 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20200303
index 57e2445501f5..2ffb04415426 100644
--- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20200303
+++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20200303
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Extension for nxml-mode with Gentoo-specific schemas
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=HPND MIT GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20200303.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=7ccf14db5981339fbd4cd3214521d145
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314
index 1e8bc0e89b55..3db779f1a94b 100644
--- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314
+++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Extension for nxml-mode with Gentoo-specific schemas
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=HPND MIT GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20210314.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=7ccf14db5981339fbd4cd3214521d145
diff --git a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-5.8.0 b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-5.8.0
index 6aa0fefcba9f..7954f384cfd9 100644
--- a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-5.8.0
+++ b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-5.8.0
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Extension for nxml-mode with libvirt schemas
 EAPI=7
 HOMEPAGE=http://www.libvirt.org/
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-5.8.0.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=1dff5e30f6f7b2c943961d23d82999af
diff --git a/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1 b/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1
index cad13f132537..c75175fd07ee 100644
--- a/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1
+++ b/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Extension for nxml-mode with SVG 1.1 schemas
 EAPI=7
 HOMEPAGE=http://www.w3.org/TR/SVG11/
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=HPND
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=1.1
 SRC_URI=http://www.flameeyes.eu/gentoo-distfiles/w3c-svg-rng-1.1.20081123.zip
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=2e3df112cfd4dc76d9f68f3497d6898d
diff --git a/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0 b/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0
index 8b520d46bb00..de376f2c9597 100644
--- a/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0
+++ b/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs mode for OCaml
 EAPI=7
 HOMEPAGE=https://ocaml.org/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.05.0.tar.gz -> ocaml-4.05.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=b941f17691c86bff697d68d6f6517b6d
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.4 b/metadata/md5-cache/app-emacs/org-mode-9.4
index 16eb426cd835..dcd6fecba166 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.4
+++ b/metadata/md5-cache/app-emacs/org-mode-9.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Emacs mode for notes and project planning
 EAPI=7
 HOMEPAGE=https://www.orgmode.org/
+INHERIT=elisp readme.gentoo-r1
 IUSE=contrib doc odt-schema
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )
@@ -10,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://orgmode.org/org-9.4.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=fede4d363250c1deddd688d1df5614f2
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.4.4 b/metadata/md5-cache/app-emacs/org-mode-9.4.4
index 82f03c203812..2b50eed9b5b8 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.4.4
+++ b/metadata/md5-cache/app-emacs/org-mode-9.4.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Emacs mode for notes and project planning
 EAPI=7
 HOMEPAGE=https://www.orgmode.org/
+INHERIT=elisp readme.gentoo-r1
 IUSE=contrib doc odt-schema
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )
@@ -10,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://orgmode.org/org-9.4.4.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=fede4d363250c1deddd688d1df5614f2
diff --git a/metadata/md5-cache/app-emacs/outline-magic-0.9 b/metadata/md5-cache/app-emacs/outline-magic-0.9
index 8b362460d66e..0c0dce861955 100644
--- a/metadata/md5-cache/app-emacs/outline-magic-0.9
+++ b/metadata/md5-cache/app-emacs/outline-magic-0.9
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Outline mode extensions for Emacs
 EAPI=5
 HOMEPAGE=https://github.com/tj64/outline-magic https://www.emacswiki.org/emacs/OutlineMagic
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/outline-magic-0.9.el.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=aac2f3da7eb68b1e579c68132b4e8e3d
diff --git a/metadata/md5-cache/app-emacs/paredit-23-r1 b/metadata/md5-cache/app-emacs/paredit-23-r1
index 5fa628614189..c9021f3c8975 100644
--- a/metadata/md5-cache/app-emacs/paredit-23-r1
+++ b/metadata/md5-cache/app-emacs/paredit-23-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Minor mode for performing structured editing of S-expressions
 EAPI=5
 HOMEPAGE=https://mumble.net/~campbell/emacs/ https://www.emacswiki.org/emacs/ParEdit
+INHERIT=elisp
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/paredit-23.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=7339c87c71ff5f7cc15e3f6258c70b76
diff --git a/metadata/md5-cache/app-emacs/pariemacs-3.14 b/metadata/md5-cache/app-emacs/pariemacs-3.14
index 311231b87ef5..ddb97485648f 100644
--- a/metadata/md5-cache/app-emacs/pariemacs-3.14
+++ b/metadata/md5-cache/app-emacs/pariemacs-3.14
@@ -3,10 +3,11 @@ DEPEND=sci-mathematics/pari >=app-editors/emacs-23.1:*
 DESCRIPTION=sci-mathematics/pari emacs mode
 EAPI=6
 HOMEPAGE=http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sci-mathematics/pari >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/latest-pari-distrib/pariemacs-3.14.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=8ee143a7579375bbf2417a32b2dce359
diff --git a/metadata/md5-cache/app-emacs/php-mode-1.22.1 b/metadata/md5-cache/app-emacs/php-mode-1.22.1
index 13e6b62092f6..3348a844001c 100644
--- a/metadata/md5-cache/app-emacs/php-mode-1.22.1
+++ b/metadata/md5-cache/app-emacs/php-mode-1.22.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=GNU Emacs major mode for editing PHP code
 EAPI=7
 HOMEPAGE=https://github.com/ejmr/php-mode
+INHERIT=elisp
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ejmr/php-mode/archive/v1.22.1.tar.gz -> php-mode-1.22.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=9e663bb65fffba949e3d92d7b090cba4
diff --git a/metadata/md5-cache/app-emacs/php-mode-1.23.0 b/metadata/md5-cache/app-emacs/php-mode-1.23.0
index 349a2f7c3156..72043beead42 100644
--- a/metadata/md5-cache/app-emacs/php-mode-1.23.0
+++ b/metadata/md5-cache/app-emacs/php-mode-1.23.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=GNU Emacs major mode for editing PHP code
 EAPI=7
 HOMEPAGE=https://github.com/ejmr/php-mode
+INHERIT=elisp
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ejmr/php-mode/archive/v1.23.0.tar.gz -> php-mode-1.23.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=9e663bb65fffba949e3d92d7b090cba4
diff --git a/metadata/md5-cache/app-emacs/planner-3.42-r1 b/metadata/md5-cache/app-emacs/planner-3.42-r1
index c67056db7989..c3adcf9fe5ab 100644
--- a/metadata/md5-cache/app-emacs/planner-3.42-r1
+++ b/metadata/md5-cache/app-emacs/planner-3.42-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Maintain a local Wiki using Emacs-friendly markup
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/PlannerMode
+INHERIT=elisp
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3+
 PDEPEND=app-emacs/remember
@@ -10,5 +11,5 @@ RDEPEND=>=app-emacs/muse-3.02.6a app-emacs/bbdb app-emacs/emacs-w3m >=app-editor
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/planner-3.42.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=cddd455a6413785e32fd1056ec109509
diff --git a/metadata/md5-cache/app-emacs/po-mode-0.20.1 b/metadata/md5-cache/app-emacs/po-mode-0.20.1
index 46c574bf9351..7f35079c726b 100644
--- a/metadata/md5-cache/app-emacs/po-mode-0.20.1
+++ b/metadata/md5-cache/app-emacs/po-mode-0.20.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Major mode for GNU gettext PO files
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gettext/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.20.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=ec82281fda7702454972715eb8375151
diff --git a/metadata/md5-cache/app-emacs/popup-0.5.3 b/metadata/md5-cache/app-emacs/popup-0.5.3
index dc93974d465a..4d384d04b272 100644
--- a/metadata/md5-cache/app-emacs/popup-0.5.3
+++ b/metadata/md5-cache/app-emacs/popup-0.5.3
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Visual popup interface library for Emacs
 EAPI=7
 HOMEPAGE=https://github.com/auto-complete/popup-el
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/auto-complete/popup-el/archive/v0.5.3.tar.gz -> popup-el-0.5.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=494bee3e7a380d10dbffc5138ec94939
diff --git a/metadata/md5-cache/app-emacs/popwin-1.0.0 b/metadata/md5-cache/app-emacs/popwin-1.0.0
index e75d81175d8b..b310f6f57f75 100644
--- a/metadata/md5-cache/app-emacs/popwin-1.0.0
+++ b/metadata/md5-cache/app-emacs/popwin-1.0.0
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Popup window manager for Emacs
 EAPI=7
 HOMEPAGE=https://github.com/m2ym/popwin-el
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/m2ym/popwin-el/archive/v1.0.0.tar.gz -> popwin-1.0.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=5c43cabeca2c46d5ddc270e090a292aa
diff --git a/metadata/md5-cache/app-emacs/pov-mode-3.3-r1 b/metadata/md5-cache/app-emacs/pov-mode-3.3-r1
index 46a27b974814..883849d792d7 100644
--- a/metadata/md5-cache/app-emacs/pov-mode-3.3-r1
+++ b/metadata/md5-cache/app-emacs/pov-mode-3.3-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Major mode for Povray scene files
 EAPI=7
 HOMEPAGE=https://github.com/melmothx/pov-mode
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ FDL-1.2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacsmirror/pov-mode/archive/v3.3.tar.gz -> pov-mode-3.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=6706411cec44ff9cd9285b46de710bb9
diff --git a/metadata/md5-cache/app-emacs/proofgeneral-4.4 b/metadata/md5-cache/app-emacs/proofgeneral-4.4
index be2ec9da0706..dc575dc7768b 100644
--- a/metadata/md5-cache/app-emacs/proofgeneral-4.4
+++ b/metadata/md5-cache/app-emacs/proofgeneral-4.4
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A generic interface for proof assistants
 EAPI=7
 HOMEPAGE=https://proofgeneral.github.io/
+INHERIT=elisp
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0
 RDEPEND=>=app-emacs/mmm-mode-0.4.8-r2 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ProofGeneral/PG/archive/v4.4.tar.gz -> proofgeneral-4.4.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=57c64b4e5b7267dd222c582bca407b58
diff --git a/metadata/md5-cache/app-emacs/protbuf-1.7-r1 b/metadata/md5-cache/app-emacs/protbuf-1.7-r1
index 12baf7ded1e8..45a6335c7e9f 100644
--- a/metadata/md5-cache/app-emacs/protbuf-1.7-r1
+++ b/metadata/md5-cache/app-emacs/protbuf-1.7-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Protect Emacs buffers from accidental killing
 EAPI=5
 HOMEPAGE=http://www.splode.com/~friedman/software/emacs-lisp/ https://www.emacswiki.org/emacs/ProtectingBuffers
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/protbuf-1.7.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=33a7bc541106ab1268d2d4a72591c33d
diff --git a/metadata/md5-cache/app-emacs/psgml-1.4.1 b/metadata/md5-cache/app-emacs/psgml-1.4.1
index 2286b2dbb40c..40846f997987 100644
--- a/metadata/md5-cache/app-emacs/psgml-1.4.1
+++ b/metadata/md5-cache/app-emacs/psgml-1.4.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A GNU Emacs Major Mode for editing SGML and XML coded documents
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/PsgmlMode
+INHERIT=elisp
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=app-text/openjade >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/psgml-1.4.1.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=67138fb6db302c799196d2563d4fc2f5
diff --git a/metadata/md5-cache/app-emacs/puppet-mode-0.3-r1 b/metadata/md5-cache/app-emacs/puppet-mode-0.3-r1
index 8b1018a5513a..f1df470b72e5 100644
--- a/metadata/md5-cache/app-emacs/puppet-mode-0.3-r1
+++ b/metadata/md5-cache/app-emacs/puppet-mode-0.3-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Emacs major mode for editing Puppet manifests
 EAPI=6
 HOMEPAGE=https://github.com/voxpupuli/puppet-mode
+INHERIT=elisp
 KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/0.3.tar.gz -> puppet-mode-0.3.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=e4a9dbfd4450767946ea207b47218536
diff --git a/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813 b/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813
index 516d53063375..e7105957001f 100644
--- a/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813
+++ b/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813
@@ -3,11 +3,12 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Emacs major mode for editing Puppet manifests
 EAPI=6
 HOMEPAGE=https://github.com/voxpupuli/puppet-mode
+INHERIT=elisp
 KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/7dee1b5a5debac6e56f9107492a413b6c0edb94d.tar.gz -> puppet-mode-0.3.20180813.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=5cefddeebf772aee1bf6202bdf3dd42b
diff --git a/metadata/md5-cache/app-emacs/pymacs-0.26-r2 b/metadata/md5-cache/app-emacs/pymacs-0.26-r2
index cd7b5a97587b..ab10834ece8e 100644
--- a/metadata/md5-cache/app-emacs/pymacs-0.26-r2
+++ b/metadata/md5-cache/app-emacs/pymacs-0.26-r2
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpa
 DESCRIPTION=A tool that allows both-side communication beetween Python and Emacs Lisp
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/PyMacs
+INHERIT=elisp distutils-r1
 IUSE=doc python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
@@ -10,5 +11,5 @@ RDEPEND=>=app-editors/emacs-23.1:* python_targets_python3_7? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/dgentry/Pymacs/archive/v0.26.tar.gz -> pymacs-0.26.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f
 _md5_=a009d977c61dada9a802dd6da1bf6f85
diff --git a/metadata/md5-cache/app-emacs/python-mode-6.2.3 b/metadata/md5-cache/app-emacs/python-mode-6.2.3
index 35b44bac6bc3..4ac884ab4f3b 100644
--- a/metadata/md5-cache/app-emacs/python-mode-6.2.3
+++ b/metadata/md5-cache/app-emacs/python-mode-6.2.3
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=An Emacs major mode for editing Python source
 EAPI=6
 HOMEPAGE=https://launchpad.net/python-mode
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://launchpad.net/python-mode/trunk/6.2.3/+download/python-mode.el-6.2.3.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=77a866103fd6bdda2f0d983369f37a3a
diff --git a/metadata/md5-cache/app-emacs/quack-0.48 b/metadata/md5-cache/app-emacs/quack-0.48
index bfe11bc1f49b..cd16fe5f9719 100644
--- a/metadata/md5-cache/app-emacs/quack-0.48
+++ b/metadata/md5-cache/app-emacs/quack-0.48
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Enhances Emacs support for Scheme
 EAPI=7
 HOMEPAGE=http://www.neilvandyke.org/quack/
+INHERIT=elisp
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/quack-0.48.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=6f686db065171041cf8bab133ce4c2d0
diff --git a/metadata/md5-cache/app-emacs/quilt-el-0.66 b/metadata/md5-cache/app-emacs/quilt-el-0.66
index aa48fee2906a..81a1eadd1512 100644
--- a/metadata/md5-cache/app-emacs/quilt-el-0.66
+++ b/metadata/md5-cache/app-emacs/quilt-el-0.66
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Quilt mode for Emacs
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/quilt http://satoru-takeuchi.org/dev/quilt-el/
+INHERIT=elisp
 KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86
 LICENSE=GPL-1+
 RDEPEND=dev-util/quilt >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://nongnu/quilt/quilt-0.66.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=e6ee5488e530f7672a3754789b64c349
diff --git a/metadata/md5-cache/app-emacs/qwerty-1.1 b/metadata/md5-cache/app-emacs/qwerty-1.1
index 647580162bd9..2895f0a88d99 100644
--- a/metadata/md5-cache/app-emacs/qwerty-1.1
+++ b/metadata/md5-cache/app-emacs/qwerty-1.1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Switch between QWERTY and DVORAK without changing the console keymap
 EAPI=5
 HOMEPAGE=https://groups.google.com/group/gnu.emacs.sources/msg/eab31c752dfdd3a5
+INHERIT=elisp
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-1+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/qwerty-1.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=cf1594a28e7122d83a56e40de3a71b7e
diff --git a/metadata/md5-cache/app-emacs/redo+-1.19 b/metadata/md5-cache/app-emacs/redo+-1.19
index a61a8539f8e2..8ff6b1a4906a 100644
--- a/metadata/md5-cache/app-emacs/redo+-1.19
+++ b/metadata/md5-cache/app-emacs/redo+-1.19
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Redo/undo system for Emacs
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/RedoPlus https://www11.atwiki.jp/s-irie/pages/18.html
+INHERIT=readme.gentoo elisp
 KEYWORDS=~alpha amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/redo+-1.19.el.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=a29539a37d1f2edba167895bdc6d22e3
diff --git a/metadata/md5-cache/app-emacs/regress-1.5.1 b/metadata/md5-cache/app-emacs/regress-1.5.1
index fc3aed3a93e9..b17ed320bb3c 100644
--- a/metadata/md5-cache/app-emacs/regress-1.5.1
+++ b/metadata/md5-cache/app-emacs/regress-1.5.1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Regression test harness for Emacs Lisp code
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/WikifiedEmacsLispList
+INHERIT=elisp
 KEYWORDS=~alpha amd64 ppc x86
 LICENSE=GPL-1+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/regress-1.5.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=57730c4ccf94e6c1c7e938ff1efedf05
diff --git a/metadata/md5-cache/app-emacs/remember-2.0-r1 b/metadata/md5-cache/app-emacs/remember-2.0-r1
index 9262c8954520..5aa17ac851f7 100644
--- a/metadata/md5-cache/app-emacs/remember-2.0-r1
+++ b/metadata/md5-cache/app-emacs/remember-2.0-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Simplify writing short notes in emacs
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/RememberMode
+INHERIT=elisp
 IUSE=bbdb planner
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3+ FDL-1.2+
@@ -10,5 +11,5 @@ RDEPEND=bbdb? ( app-emacs/bbdb ) planner? ( app-emacs/planner ) >=app-editors/em
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jwiegley/remember/archive/v2.0.tar.gz -> remember-2.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=7717fe7ec6d7cf054a36115a58fb1e3f
diff --git a/metadata/md5-cache/app-emacs/revive-2.24 b/metadata/md5-cache/app-emacs/revive-2.24
index 20062afee9a1..b6d2bc8da529 100644
--- a/metadata/md5-cache/app-emacs/revive-2.24
+++ b/metadata/md5-cache/app-emacs/revive-2.24
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Resume Emacs
 EAPI=7
 HOMEPAGE=https://www.gentei.org/~yuuji/software/
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/revive-2.24.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=3dccdc46beff89c1ebb4d15ff43f7acc
diff --git a/metadata/md5-cache/app-emacs/rfcview-0.13 b/metadata/md5-cache/app-emacs/rfcview-0.13
index e42ee2555ee1..7acc83abe59c 100644
--- a/metadata/md5-cache/app-emacs/rfcview-0.13
+++ b/metadata/md5-cache/app-emacs/rfcview-0.13
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=An Emacs mode that reformats IETF RFCs for display
 EAPI=5
 HOMEPAGE=http://www.loveshack.ukfsn.org/emacs/ https://www.emacswiki.org/emacs/RfcView
+INHERIT=elisp
 KEYWORDS=~alpha amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rfcview-0.13.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=5d5f294b372141d0d61e20a4d9347474
diff --git a/metadata/md5-cache/app-emacs/riece-9.0.0 b/metadata/md5-cache/app-emacs/riece-9.0.0
index 10e7038a82c2..a55f1b8bb0ed 100644
--- a/metadata/md5-cache/app-emacs/riece-9.0.0
+++ b/metadata/md5-cache/app-emacs/riece-9.0.0
@@ -3,6 +3,7 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=A redesign of Liece IRC client
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/riece/
+INHERIT=elisp
 IUSE=l10n_ja
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2+ FDL-1.1+
@@ -10,5 +11,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/riece/riece-9.0.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=160f9d8694ab1b3354d7c45461d1771a
diff --git a/metadata/md5-cache/app-emacs/rnc-mode-1.0.6 b/metadata/md5-cache/app-emacs/rnc-mode-1.0.6
index bc8cf5c021fa..32fa12f370a5 100644
--- a/metadata/md5-cache/app-emacs/rnc-mode-1.0.6
+++ b/metadata/md5-cache/app-emacs/rnc-mode-1.0.6
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Emacs mode for editing Relax NG compact schema files
 EAPI=7
 HOMEPAGE=https://github.com/TreeRex/rnc-mode https://www.emacswiki.org/emacs/RELAX_NG
+INHERIT=elisp
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/TreeRex/rnc-mode/archive/1.0.6.tar.gz -> rnc-mode-1.0.6.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=a88ec621d79879fd7772914c6f6f2545
diff --git a/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15 b/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
index 22afc924f9a2..d522877a991c 100644
--- a/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
+++ b/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Emacs mode to ease editing of RPM spec files
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/RpmSpecMode
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rpm-spec-mode-0.15.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=c2e58e28a9eb5afcfb8279229609d7a2
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.5.5 b/metadata/md5-cache/app-emacs/ruby-mode-2.5.5
index 7f60e43c85b4..601768be8a19 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.5.5
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.5.5
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Emacs major mode for editing Ruby code
 EAPI=6
 HOMEPAGE=https://www.ruby-lang.org/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/ruby-2.5.5.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=2f92afc0b53f0c61d287aa01b47c5482
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.6.3 b/metadata/md5-cache/app-emacs/ruby-mode-2.6.3
index fa9a6f365a18..7e62f3f8dbae 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.6.3
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.6.3
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs major mode for editing Ruby code
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ruby/elisp/archive/75bccbb384e6907df47ab69acdccb4536806c890.tar.gz -> ruby-mode-2.6.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=2d3b9de0ccc9b153948747c0f7e6e325
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.7.0 b/metadata/md5-cache/app-emacs/ruby-mode-2.7.0
index f1771a0d0508..4fdf1ee94d14 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.7.0
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.7.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs major mode for editing Ruby code
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
+INHERIT=elisp
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ruby/elisp/archive/defe0b586b2a888706507a7bbcdf1201d924cc2d.tar.gz -> ruby-mode-2.7.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=2e3546f01128c63904e53f0a99b692ba
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-3.0.0 b/metadata/md5-cache/app-emacs/ruby-mode-3.0.0
index 88dbc8b9e887..9c305af4eb02 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-3.0.0
+++ b/metadata/md5-cache/app-emacs/ruby-mode-3.0.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs major mode for editing Ruby code
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
+INHERIT=elisp
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ruby/elisp/archive/586b679b4ae9685a24003502249920e7721c6e24.tar.gz -> ruby-mode-3.0.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=9566ff7441187172a7e775754b24bb7a
diff --git a/metadata/md5-cache/app-emacs/rudel-0.3.1 b/metadata/md5-cache/app-emacs/rudel-0.3.1
index 0f62a899a24a..6b27df088a85 100644
--- a/metadata/md5-cache/app-emacs/rudel-0.3.1
+++ b/metadata/md5-cache/app-emacs/rudel-0.3.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Collaborative editing environment for GNU Emacs
 EAPI=7
 HOMEPAGE=http://rudel.sourceforge.net/ https://www.emacswiki.org/emacs/Rudel
+INHERIT=readme.gentoo-r1 elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rudel-0.3.1.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=c1a209918a690f26dede24b956ebd6d8
diff --git a/metadata/md5-cache/app-emacs/rudel-0.3_pre20110721-r1 b/metadata/md5-cache/app-emacs/rudel-0.3_pre20110721-r1
index 39662f4096dc..cc6aa44513a7 100644
--- a/metadata/md5-cache/app-emacs/rudel-0.3_pre20110721-r1
+++ b/metadata/md5-cache/app-emacs/rudel-0.3_pre20110721-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-24:*
 DESCRIPTION=Collaborative editing environment for GNU Emacs
 EAPI=6
 HOMEPAGE=http://rudel.sourceforge.net/ https://www.emacswiki.org/emacs/Rudel
+INHERIT=readme.gentoo-r1 elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rudel-0.3_pre20110721.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=85263b1b75dbbc1c717d2b0d2d6345e9
diff --git a/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20190125 b/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20190125
index 8944a982770d..3ac48d65cd53 100644
--- a/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20190125
+++ b/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20190125
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpa
 DESCRIPTION=A major emacs mode for editing Rust source code
 EAPI=7
 HOMEPAGE=https://github.com/rust-lang/rust-mode
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rust-mode-0.3.0_p20190125.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=6e27e9c8ca0593c7a0c5117a654480ed
diff --git a/metadata/md5-cache/app-emacs/rust-mode-0.4.0 b/metadata/md5-cache/app-emacs/rust-mode-0.4.0
index d294bdae6613..14d5604266be 100644
--- a/metadata/md5-cache/app-emacs/rust-mode-0.4.0
+++ b/metadata/md5-cache/app-emacs/rust-mode-0.4.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpa
 DESCRIPTION=A major emacs mode for editing Rust source code
 EAPI=7
 HOMEPAGE=https://github.com/rust-lang/rust-mode
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/rust-lang/rust-mode/archive/0.4.0.tar.gz -> rust-mode-0.4.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=46fbeccadc048af1adb746d0660cb358
diff --git a/metadata/md5-cache/app-emacs/s-1.12.0 b/metadata/md5-cache/app-emacs/s-1.12.0
index 54946fb81d5a..26ffcc1f8c0f 100644
--- a/metadata/md5-cache/app-emacs/s-1.12.0
+++ b/metadata/md5-cache/app-emacs/s-1.12.0
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=The long lost Emacs string manipulation library
 EAPI=6
 HOMEPAGE=https://github.com/magnars/s.el
+INHERIT=elisp
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/s.el/archive/1.12.0.tar.gz -> s-1.12.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=26b7b91b1ce43a1548726e13a0386190
diff --git a/metadata/md5-cache/app-emacs/scala-mode-2.10.3 b/metadata/md5-cache/app-emacs/scala-mode-2.10.3
index fe8883469e2c..4c02098e5cf3 100644
--- a/metadata/md5-cache/app-emacs/scala-mode-2.10.3
+++ b/metadata/md5-cache/app-emacs/scala-mode-2.10.3
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Scala mode for Emacs
 EAPI=5
 HOMEPAGE=https://www.scala-lang.org/
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-lang/scala >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://www.scala-lang.org/files/archive/scala-tool-support-2.10.3.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=c166f8e1187eae832175edd2b5f13e37
diff --git a/metadata/md5-cache/app-emacs/scheme-complete-0.9.8 b/metadata/md5-cache/app-emacs/scheme-complete-0.9.8
index 0fa767e7f612..dcc36b9fd504 100644
--- a/metadata/md5-cache/app-emacs/scheme-complete-0.9.8
+++ b/metadata/md5-cache/app-emacs/scheme-complete-0.9.8
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Scheme tab-completion and word-completion for Emacs
 EAPI=7
 HOMEPAGE=http://synthcode.com/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://synthcode.com/emacs/scheme-complete-0.9.8.el.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=691b40f044a1d8813808672c7efb1cda
diff --git a/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1 b/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1
index 2b35e68de308..db1d5dfa5c23 100644
--- a/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1
+++ b/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=a SCIM-Bridge client for Emacs
 EAPI=7
 HOMEPAGE=https://launchpad.net/scim-bridge.el
+INHERIT=elisp
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=app-i18n/scim >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://launchpad.net/scim-bridge.el/0.8/0.8.2/+download/scim-bridge-el-0.8.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=ec7289150fac0fb342c2ac2a2265461d
diff --git a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107 b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107
index 05e5dcc433a0..46bf822f2859 100644
--- a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107
+++ b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Major mode for editing SCSS files in Emacs
 EAPI=7
 HOMEPAGE=https://github.com/antonj/scss-mode
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-ruby/sass >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/antonj/scss-mode/archive/b010d134f499c4b4ad33fe8a669a81e9a531b0b2.tar.gz -> scss-mode-0.5.0_p20150107.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=8b3f623a618bf25d264112a35f2b6433
diff --git a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1 b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1
index b23bbca43052..c04dacb86404 100644
--- a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1
+++ b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Major mode for editing SCSS files in Emacs
 EAPI=7
 HOMEPAGE=https://github.com/antonj/scss-mode
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-ruby/sass >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/antonj/scss-mode/archive/cf58dbec5394280503eb5502938f3b5445d1b53d.tar.gz -> scss-mode-0.5.0_p20180123.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=f21b6da45eb524b1fa5e5a33f95afd56
diff --git a/metadata/md5-cache/app-emacs/semi-1.14.6-r2 b/metadata/md5-cache/app-emacs/semi-1.14.6-r2
index 7d0f5ab08d3c..fd3105d681bd 100644
--- a/metadata/md5-cache/app-emacs/semi-1.14.6-r2
+++ b/metadata/md5-cache/app-emacs/semi-1.14.6-r2
@@ -3,11 +3,12 @@ DEPEND=>=app-emacs/apel-10.6 app-emacs/flim >=app-editors/emacs-23.1:*
 DESCRIPTION=A library to provide MIME feature for GNU Emacs
 EAPI=5
 HOMEPAGE=http://git.chise.org/elisp/semi/
+INHERIT=elisp eutils
 IUSE=l10n_ja
 KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.6 app-emacs/flim >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/semi-1.14.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=e3def62f006468726fcb2f46c134a500
diff --git a/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517 b/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
index 872097d377c3..88761c261bc2 100644
--- a/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
+++ b/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
@@ -4,11 +4,12 @@ DEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9
 DESCRIPTION=A library to provide MIME feature for GNU Emacs
 EAPI=7
 HOMEPAGE=https://github.com/wanderlust/semi
+INHERIT=elisp
 IUSE=l10n_ja
 KEYWORDS=~alpha amd64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/semi/archive/4cf114c95fb49ad75eb6916f678b45b04bad8122.tar.gz -> semi-1.14.7_p20190517.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=6e2ee292f29141e9a931b2f03610c166
diff --git a/metadata/md5-cache/app-emacs/session-2.4b b/metadata/md5-cache/app-emacs/session-2.4b
index bb28a11b4f7f..262761cfd3f5 100644
--- a/metadata/md5-cache/app-emacs/session-2.4b
+++ b/metadata/md5-cache/app-emacs/session-2.4b
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=When you start Emacs, Session restores various variables from your last session
 EAPI=7
 HOMEPAGE=http://emacs-session.sourceforge.net/
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-session/session-2.4b.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=ecc272b50db98a62134bc1c44d6d8b5e
diff --git a/metadata/md5-cache/app-emacs/setnu-1.06 b/metadata/md5-cache/app-emacs/setnu-1.06
index d8355e2a331f..c81ab7280d22 100644
--- a/metadata/md5-cache/app-emacs/setnu-1.06
+++ b/metadata/md5-cache/app-emacs/setnu-1.06
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Display line numbers in Emacs buffers
 EAPI=5
 HOMEPAGE=http://www.wonderworks.com/ https://www.emacswiki.org/emacs/LineNumbers
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/setnu-1.06.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=98e5281c80d21620565645931af2c3c3
diff --git a/metadata/md5-cache/app-emacs/slime-2.15 b/metadata/md5-cache/app-emacs/slime-2.15
index 1725ddd70ad7..97ea9781afcd 100644
--- a/metadata/md5-cache/app-emacs/slime-2.15
+++ b/metadata/md5-cache/app-emacs/slime-2.15
@@ -3,6 +3,7 @@ DEPEND=virtual/commonlisp dev-lisp/asdf >=sys-apps/texinfo-5.1 doc? ( virtual/te
 DESCRIPTION=SLIME, the Superior Lisp Interaction Mode (Extended)
 EAPI=5
 HOMEPAGE=http://common-lisp.net/project/slime/
+INHERIT=common-lisp-3 elisp eutils
 IUSE=doc xref
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2 xref? ( xref.lisp )
@@ -11,5 +12,5 @@ RDEPEND=virtual/commonlisp dev-lisp/asdf >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.15.tar.gz -> slime-2.15.tar.gz
-_eclasses_=common-lisp-3	cc559c74a20195d5ca316bc53265018d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	common-lisp-3	cc559c74a20195d5ca316bc53265018d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=8ab5736ced67822251a3a079c68d64ec
diff --git a/metadata/md5-cache/app-emacs/slime-2.20 b/metadata/md5-cache/app-emacs/slime-2.20
index df452dc4ad5d..c432fdf63c12 100644
--- a/metadata/md5-cache/app-emacs/slime-2.20
+++ b/metadata/md5-cache/app-emacs/slime-2.20
@@ -3,6 +3,7 @@ DEPEND=virtual/commonlisp dev-lisp/asdf >=sys-apps/texinfo-5.1 doc? ( virtual/te
 DESCRIPTION=SLIME, the Superior Lisp Interaction Mode (Extended)
 EAPI=6
 HOMEPAGE=http://common-lisp.net/project/slime/
+INHERIT=elisp
 IUSE=doc xref
 KEYWORDS=amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2 xref? ( xref.lisp )
@@ -10,5 +11,5 @@ RDEPEND=virtual/commonlisp dev-lisp/asdf >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.20.tar.gz -> slime-2.20.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=de596a97204c603dd6bbda9b460da4ea
diff --git a/metadata/md5-cache/app-emacs/slime-2.20-r1 b/metadata/md5-cache/app-emacs/slime-2.20-r1
index 843779c338f4..d89f62381805 100644
--- a/metadata/md5-cache/app-emacs/slime-2.20-r1
+++ b/metadata/md5-cache/app-emacs/slime-2.20-r1
@@ -3,6 +3,7 @@ DEPEND=virtual/commonlisp dev-lisp/asdf >=sys-apps/texinfo-5.1 doc? ( virtual/te
 DESCRIPTION=SLIME, the Superior Lisp Interaction Mode (Extended)
 EAPI=6
 HOMEPAGE=http://common-lisp.net/project/slime/
+INHERIT=elisp
 IUSE=doc xref
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2 xref? ( xref.lisp )
@@ -10,5 +11,5 @@ RDEPEND=virtual/commonlisp dev-lisp/asdf >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.20.tar.gz -> slime-2.20.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=43334091c0b7ac890b211407410d8ee0
diff --git a/metadata/md5-cache/app-emacs/slime-2.21 b/metadata/md5-cache/app-emacs/slime-2.21
index 8eede3057f02..221933ecdd5a 100644
--- a/metadata/md5-cache/app-emacs/slime-2.21
+++ b/metadata/md5-cache/app-emacs/slime-2.21
@@ -3,6 +3,7 @@ DEPEND=virtual/commonlisp dev-lisp/asdf >=sys-apps/texinfo-5.1 doc? ( virtual/te
 DESCRIPTION=SLIME, the Superior Lisp Interaction Mode (Extended)
 EAPI=6
 HOMEPAGE=http://common-lisp.net/project/slime/
+INHERIT=elisp
 IUSE=doc xref
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2 xref? ( xref.lisp )
@@ -10,5 +11,5 @@ RDEPEND=virtual/commonlisp dev-lisp/asdf >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.21.tar.gz -> slime-2.21.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=99cef5113c4d0404f7c7e2f28f96ce1c
diff --git a/metadata/md5-cache/app-emacs/sml-mode-6.9 b/metadata/md5-cache/app-emacs/sml-mode-6.9
index fda429168c3e..33b649c87f11 100644
--- a/metadata/md5-cache/app-emacs/sml-mode-6.9
+++ b/metadata/md5-cache/app-emacs/sml-mode-6.9
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs major mode for editing Standard ML
 EAPI=7
 HOMEPAGE=https://elpa.gnu.org/packages/sml-mode.html http://www.iro.umontreal.ca/~monnier/elisp/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 ppc x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/sml-mode-6.9.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=8a9aacf862113149ae1d968869d6510f
diff --git a/metadata/md5-cache/app-emacs/sokoban-1.4.8 b/metadata/md5-cache/app-emacs/sokoban-1.4.8
index 041eba9d3184..0a9f9321400d 100644
--- a/metadata/md5-cache/app-emacs/sokoban-1.4.8
+++ b/metadata/md5-cache/app-emacs/sokoban-1.4.8
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Implementation of Sokoban for Emacs
 EAPI=7
 HOMEPAGE=https://elpa.gnu.org/packages/sokoban.html
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://elpa.gnu.org/packages/sokoban-1.4.8.tar
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=22eea890fdfa7f597bc1762942844d34
diff --git a/metadata/md5-cache/app-emacs/ssh-20120709 b/metadata/md5-cache/app-emacs/ssh-20120709
index f1e7cca59e02..9499493981bc 100644
--- a/metadata/md5-cache/app-emacs/ssh-20120709
+++ b/metadata/md5-cache/app-emacs/ssh-20120709
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Support for SSH sessions in Emacs shell buffers
 EAPI=5
 HOMEPAGE=http://www.splode.com/~friedman/software/emacs-lisp/index.html#ssh
+INHERIT=elisp
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ssh-20120709.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=6a02d9ef2357593fecc321e4831db3cb
diff --git a/metadata/md5-cache/app-emacs/stripes-0.2-r2 b/metadata/md5-cache/app-emacs/stripes-0.2-r2
index 127a7d44ef24..4644837ced38 100644
--- a/metadata/md5-cache/app-emacs/stripes-0.2-r2
+++ b/metadata/md5-cache/app-emacs/stripes-0.2-r2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Emacs mode that alternates the background color of lines
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/StripesMode
+INHERIT=elisp
 KEYWORDS=~alpha amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/stripes-0.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=55fa2593b7c9292e9044890eb9ff3a4a
diff --git a/metadata/md5-cache/app-emacs/sumibi-0.7.4 b/metadata/md5-cache/app-emacs/sumibi-0.7.4
index 5b7c0de852c2..15c71bbf7585 100644
--- a/metadata/md5-cache/app-emacs/sumibi-0.7.4
+++ b/metadata/md5-cache/app-emacs/sumibi-0.7.4
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Statistical Japanese input method using the Internet as a large corpus
 EAPI=7
 HOMEPAGE=http://sumibi.org/sumibi/sumibi.html
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/sumibi/26504/sumibi-0.7.4.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=c03ed682ab3cf377d43ebdaf661d4b0d
diff --git a/metadata/md5-cache/app-emacs/teco-7-r2 b/metadata/md5-cache/app-emacs/teco-7-r2
index 78e1521ea131..0ef36d11b127 100644
--- a/metadata/md5-cache/app-emacs/teco-7-r2
+++ b/metadata/md5-cache/app-emacs/teco-7-r2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=TECO interpreter for GNU Emacs
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/TECO
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/teco-7.el.bz2
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=86a0a97d8ca852f51babb3586641b6d0
diff --git a/metadata/md5-cache/app-emacs/template-3.3b b/metadata/md5-cache/app-emacs/template-3.3b
index 1d776d5ceff4..50db112cac35 100644
--- a/metadata/md5-cache/app-emacs/template-3.3b
+++ b/metadata/md5-cache/app-emacs/template-3.3b
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Use templates, decorate comments, auto-update buffers
 EAPI=7
 HOMEPAGE=http://emacs-template.sourceforge.net/
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-template/template-3.3b.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=23d681966816d0b3bdde17eb4956326a
diff --git a/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5 b/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
index 7b04e2d22226..38f13639320f 100644
--- a/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
+++ b/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Visual insertion of tempo templates
 EAPI=5
 HOMEPAGE=https://nschum.de/src/emacs/tempo-snippets/ https://www.emacswiki.org/emacs/TempoSnippets
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/tempo-snippets-0.1.5.el.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=a0ad0574231c6a1a06a1b7db2832b23e
diff --git a/metadata/md5-cache/app-emacs/thinks-1.12 b/metadata/md5-cache/app-emacs/thinks-1.12
index 10a423e22964..6d43181adf6e 100644
--- a/metadata/md5-cache/app-emacs/thinks-1.12
+++ b/metadata/md5-cache/app-emacs/thinks-1.12
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Insert text in a think bubble
 EAPI=7
 HOMEPAGE=http://www.davep.org/emacs/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/thinks.el/archive/v1.12.tar.gz -> thinks-1.12.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=d2d4b38eafb7f7423dbbcbc4f98bde9a
diff --git a/metadata/md5-cache/app-emacs/treepy-0.1.1 b/metadata/md5-cache/app-emacs/treepy-0.1.1
index f207626ef26a..d28d8e9d2ac9 100644
--- a/metadata/md5-cache/app-emacs/treepy-0.1.1
+++ b/metadata/md5-cache/app-emacs/treepy-0.1.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Generic tree traversing tools for Emacs Lisp
 EAPI=7
 HOMEPAGE=https://github.com/volrath/treepy.el
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/volrath/treepy.el/archive/0.1.1.tar.gz -> treepy-0.1.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=aeea164ef25d795b6558eaeed4cdadad
diff --git a/metadata/md5-cache/app-emacs/treepy-0.1.1-r1 b/metadata/md5-cache/app-emacs/treepy-0.1.1-r1
index 15293637df99..607160ab7d25 100644
--- a/metadata/md5-cache/app-emacs/treepy-0.1.1-r1
+++ b/metadata/md5-cache/app-emacs/treepy-0.1.1-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Generic tree traversing tools for Emacs Lisp
 EAPI=7
 HOMEPAGE=https://github.com/volrath/treepy.el
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/volrath/treepy.el/archive/0.1.1.tar.gz -> treepy-0.1.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=01a136a13f8b5e8acdf8d51019a31784
diff --git a/metadata/md5-cache/app-emacs/treepy-0.1.2 b/metadata/md5-cache/app-emacs/treepy-0.1.2
index 9626ffa457d2..f9b58a830511 100644
--- a/metadata/md5-cache/app-emacs/treepy-0.1.2
+++ b/metadata/md5-cache/app-emacs/treepy-0.1.2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Generic tree traversing tools for Emacs Lisp
 EAPI=7
 HOMEPAGE=https://github.com/volrath/treepy.el
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/volrath/treepy.el/archive/0.1.2.tar.gz -> treepy-0.1.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=4216527a9322d6ab858ee40c45d84a77
diff --git a/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0 b/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
index 71faa8b3e144..388a21f48df4 100644
--- a/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
+++ b/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Objective Caml/Camllight mode for Emacs
 EAPI=7
 HOMEPAGE=http://forge.ocamlcore.org/projects/tuareg/
+INHERIT=elisp
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+ GPL-3+ ISC
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ocaml/tuareg/archive/2.2.0.tar.gz -> tuareg-mode-2.2.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=e76c62edb1664ab0ac7eb25f2ca4ad82
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-2.0.0 b/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
index 51b76ecd7451..2b0877675569 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
+++ b/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
@@ -3,11 +3,12 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Emacs major mode for Twitter
 EAPI=6
 HOMEPAGE=http://twmode.sourceforge.net/
+INHERIT=elisp eutils
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twmode/twittering-mode-2.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=caad5da65bcfc2da3d7b061fa0abeb9f
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-3.0.0 b/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
index 41f6c2ec2fe1..85b446647866 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
+++ b/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
@@ -3,11 +3,12 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Emacs major mode for Twitter
 EAPI=6
 HOMEPAGE=http://twmode.sourceforge.net/
+INHERIT=elisp eutils
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twmode/twittering-mode-3.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=caad5da65bcfc2da3d7b061fa0abeb9f
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-9999 b/metadata/md5-cache/app-emacs/twittering-mode-9999
index acfcc8a629d8..07dad91aa8dc 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-9999
+++ b/metadata/md5-cache/app-emacs/twittering-mode-9999
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:* >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Emacs major mode for Twitter
 EAPI=6
 HOMEPAGE=http://twmode.sourceforge.net/
+INHERIT=elisp eutils git-r3
 IUSE=doc
 LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=caad5da65bcfc2da3d7b061fa0abeb9f
diff --git a/metadata/md5-cache/app-emacs/typing-1.1.4 b/metadata/md5-cache/app-emacs/typing-1.1.4
index e6c537dcf634..04f1a003b07c 100644
--- a/metadata/md5-cache/app-emacs/typing-1.1.4
+++ b/metadata/md5-cache/app-emacs/typing-1.1.4
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=The Typing of Emacs -- an Elisp parody of The Typing of the Dead for Dreamcast
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/TypingOfEmacs
+INHERIT=elisp
 KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/typing-1.1.4.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=ef3e908bcaa24c775e4791f433218148
diff --git a/metadata/md5-cache/app-emacs/uboat-1.2 b/metadata/md5-cache/app-emacs/uboat-1.2
index 50e6ef481c60..57ede4fdf72e 100644
--- a/metadata/md5-cache/app-emacs/uboat-1.2
+++ b/metadata/md5-cache/app-emacs/uboat-1.2
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Generate u-boat-death messages, patterned after Iron Coffins
 EAPI=5
 HOMEPAGE=http://www.splode.com/~friedman/software/emacs-lisp/
+INHERIT=elisp
 KEYWORDS=amd64 ppc x86
 LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/uboat-1.2.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=a4edd7440c098542e65aafc1df3ffef6
diff --git a/metadata/md5-cache/app-emacs/undo-tree-0.6.6 b/metadata/md5-cache/app-emacs/undo-tree-0.6.6
index 97cd1da0bd89..f8818a53da10 100644
--- a/metadata/md5-cache/app-emacs/undo-tree-0.6.6
+++ b/metadata/md5-cache/app-emacs/undo-tree-0.6.6
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Undo trees and visualization
 EAPI=7
 HOMEPAGE=http://www.dr-qubit.org/undo-tree.html
+INHERIT=readme.gentoo-r1 elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/undo-tree-0.6.6.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=1ab3ccd61c2c1ac84c0473a469b00aca
diff --git a/metadata/md5-cache/app-emacs/uptimes-3.7 b/metadata/md5-cache/app-emacs/uptimes-3.7
index 8a855bf2e21f..02126f0c9dc6 100644
--- a/metadata/md5-cache/app-emacs/uptimes-3.7
+++ b/metadata/md5-cache/app-emacs/uptimes-3.7
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Track and display emacs session uptimes
 EAPI=7
 HOMEPAGE=http://www.davep.org/emacs/
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/uptimes.el/archive/v3.7.tar.gz -> uptimes-3.7.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=204e9669ff84a30760a2cf1e179f7ca5
diff --git a/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1 b/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
index 28566d0dafad..5f209e4bd10b 100644
--- a/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
+++ b/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=VHDL-mode for Emacs
 EAPI=5
 HOMEPAGE=https://iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html
+INHERIT=elisp
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode-3.38.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=78612be4d30c7fe18534686eddc589df
diff --git a/metadata/md5-cache/app-emacs/visual-basic-mode-1.5 b/metadata/md5-cache/app-emacs/visual-basic-mode-1.5
index ead0bba188c3..f9f2c39dfc58 100644
--- a/metadata/md5-cache/app-emacs/visual-basic-mode-1.5
+++ b/metadata/md5-cache/app-emacs/visual-basic-mode-1.5
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A mode for editing Visual Basic programs
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/VisualBasicMode
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/visual-basic-mode-1.5.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=4df42e42f6fdf4752515b3f30a519651
diff --git a/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1 b/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
index efbc8ca17789..436598d283b5 100644
--- a/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
+++ b/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=The VM mail reader for Emacs
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/viewmail/
+INHERIT=elisp
 IUSE=bbdb ssl
 KEYWORDS=~alpha amd64 ~ia64 ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=bbdb? ( app-emacs/bbdb ) ssl? ( net-misc/stunnel ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://launchpad.net/vm/8.2.x/8.2.0b/+download/vm-8.2.0b.tgz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=9bbe4b329ef0101820c50af46c7e1d1d
diff --git a/metadata/md5-cache/app-emacs/volume-1.0-r1 b/metadata/md5-cache/app-emacs/volume-1.0-r1
index 81bc83ad897d..0cf5ff45335c 100644
--- a/metadata/md5-cache/app-emacs/volume-1.0-r1
+++ b/metadata/md5-cache/app-emacs/volume-1.0-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Tweak your sound card volume from Emacs
 EAPI=5
 HOMEPAGE=https://github.com/dbrock/volume-el
+INHERIT=elisp
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/volume-1.0.el.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=0f855b888df369f97e1284f12ab69058
diff --git a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713 b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
index 0b187d0f5931..6a7cd7544b2e 100644
--- a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
+++ b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
@@ -4,10 +4,11 @@ DEPEND=dev-libs/libvterm
 DESCRIPTION=Fully-featured terminal emulator based on libvterm
 EAPI=7
 HOMEPAGE=https://github.com/akermu/emacs-libvterm
+INHERIT=cmake elisp
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/libvterm >=app-editors/emacs-26:*[dynamic-loading] >=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://github.com/akermu/emacs-libvterm/archive/f41849c2c9c1899f22d1c3d4f871ec47c82627ce.tar.gz -> vterm-0.0.1_pre20200713.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=6c456abde569f69db8b1fb478d9c6bb3
diff --git a/metadata/md5-cache/app-emacs/w3mnav-0.5-r3 b/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
index e1a076f8dde3..fc991d522c59 100644
--- a/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
+++ b/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
@@ -3,10 +3,11 @@ DEPEND=app-emacs/emacs-w3m >=app-editors/emacs-23.1:*
 DESCRIPTION=Add Info-like navigation keys to the emacs-w3m web browser
 EAPI=5
 HOMEPAGE=http://www.neilvandyke.org/w3mnav/
+INHERIT=elisp
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-emacs/emacs-w3m >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/w3mnav-0.5.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=336c697e2cbbeba2bbc165d2f5a0d46d
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814
index 0725454e5abb..2ecbec21168a 100644
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814
@@ -3,11 +3,12 @@ DEPEND=>=app-emacs/apel-10.6 app-emacs/flim app-emacs/semi bbdb? ( app-emacs/bbd
 DESCRIPTION=Yet Another Message Interface on Emacsen
 EAPI=6
 HOMEPAGE=https://github.com/wanderlust/wanderlust
+INHERIT=elisp
 IUSE=bbdb ssl l10n_ja
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.6 app-emacs/flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/wanderlust/archive/395826e99b84051396d503392f52462b6cb683a5.tar.gz -> wanderlust-2.15.9_p20180814-git.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=3b273324dfe9f52d5f05814ce7376cf3
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
index e27554417e4f..3aa17aa63648 100644
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
@@ -4,11 +4,12 @@ DEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-emacs/semi-1.14.7 bbd
 DESCRIPTION=Yet Another Message Interface on Emacsen
 EAPI=7
 HOMEPAGE=https://github.com/wanderlust/wanderlust
+INHERIT=elisp
 IUSE=bbdb ssl l10n_ja
 KEYWORDS=~alpha amd64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-emacs/semi-1.14.7 bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/wanderlust/archive/b9a529a54b9e7eafa4ed230ad28efffe0d25a20e.tar.gz -> wanderlust-2.15.9_p20190623.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=5b15c148c95529b83eb33d507b8ec4db
diff --git a/metadata/md5-cache/app-emacs/websocket-1.10 b/metadata/md5-cache/app-emacs/websocket-1.10
index bf869cd655f1..558313d69845 100644
--- a/metadata/md5-cache/app-emacs/websocket-1.10
+++ b/metadata/md5-cache/app-emacs/websocket-1.10
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpa
 DESCRIPTION=A websocket implementation in elisp
 EAPI=7
 HOMEPAGE=https://github.com/ahyatt/emacs-websocket
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/1.10.tar.gz -> websocket-1.10.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=67b7c84697fc173cc3a45d1aa4b19e12
diff --git a/metadata/md5-cache/app-emacs/websocket-1.12 b/metadata/md5-cache/app-emacs/websocket-1.12
index e3494370d5aa..1388ba941e23 100644
--- a/metadata/md5-cache/app-emacs/websocket-1.12
+++ b/metadata/md5-cache/app-emacs/websocket-1.12
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpa
 DESCRIPTION=A websocket implementation in elisp
 EAPI=7
 HOMEPAGE=https://github.com/ahyatt/emacs-websocket
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/1.12.tar.gz -> websocket-1.12.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=8f2f06d3008a2404bcd497b928f9e8c8
diff --git a/metadata/md5-cache/app-emacs/wgrep-2.3.0 b/metadata/md5-cache/app-emacs/wgrep-2.3.0
index d3976305aaed..7a82d7b46321 100644
--- a/metadata/md5-cache/app-emacs/wgrep-2.3.0
+++ b/metadata/md5-cache/app-emacs/wgrep-2.3.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Writable grep buffer and apply the changes to files
 EAPI=7
 HOMEPAGE=https://github.com/mhayashi1120/Emacs-wgrep
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/mhayashi1120/Emacs-wgrep/archive/2.3.0.tar.gz -> wgrep-2.3.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=86de93ca42271781271c75d7bdc492f3
diff --git a/metadata/md5-cache/app-emacs/wgrep-2.3.2 b/metadata/md5-cache/app-emacs/wgrep-2.3.2
index c3d0db529af3..e658baff4b7a 100644
--- a/metadata/md5-cache/app-emacs/wgrep-2.3.2
+++ b/metadata/md5-cache/app-emacs/wgrep-2.3.2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Writable grep buffer and apply the changes to files
 EAPI=7
 HOMEPAGE=https://github.com/mhayashi1120/Emacs-wgrep
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/mhayashi1120/Emacs-wgrep/archive/2.3.2.tar.gz -> wgrep-2.3.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=bb27c1fcdc7f6274c98b903d1d218ac3
diff --git a/metadata/md5-cache/app-emacs/whine-20091222 b/metadata/md5-cache/app-emacs/whine-20091222
index 99396179a0e5..558651b3ef64 100644
--- a/metadata/md5-cache/app-emacs/whine-20091222
+++ b/metadata/md5-cache/app-emacs/whine-20091222
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Complaint generator for GNU Emacs
 EAPI=5
 HOMEPAGE=https://www.emacswiki.org/emacs/Whine
+INHERIT=elisp
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/whine-20091222.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=fdf86ad9c0d6595994973414d7ffb60a
diff --git a/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2 b/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2
index fb8410e5edc2..ea8902ff3357 100644
--- a/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2
+++ b/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Mode for editing Wikipedia articles off-line
 EAPI=7
 HOMEPAGE=https://www.emacswiki.org/emacs/WikipediaMode
+INHERIT=elisp
 IUSE=outline-magic
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=outline-magic? ( app-emacs/outline-magic ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/wikipedia-mode-0.5.el.bz2
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=8654a24ce284787db1207a4bed6c0d4c
diff --git a/metadata/md5-cache/app-emacs/windows-2.53 b/metadata/md5-cache/app-emacs/windows-2.53
index 04213363292b..79060dde2ed0 100644
--- a/metadata/md5-cache/app-emacs/windows-2.53
+++ b/metadata/md5-cache/app-emacs/windows-2.53
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Window manager for GNU Emacs
 EAPI=7
 HOMEPAGE=https://www.gentei.org/~yuuji/software/
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=app-emacs/revive >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/windows-2.53.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=1a414a30b7d0e3a3b47f793ec5adb13b
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.8.3 b/metadata/md5-cache/app-emacs/with-editor-2.8.3
index a5b1ccbd276f..d98d2046a40d 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.8.3
+++ b/metadata/md5-cache/app-emacs/with-editor-2.8.3
@@ -4,10 +4,11 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
 EAPI=7
 HOMEPAGE=https://magit.vc/manual/with-editor
+INHERIT=elisp
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.8.3.tar.gz -> with-editor-2.8.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=1dc78804774f7b958baf8bfb95a1df7a
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.9.2 b/metadata/md5-cache/app-emacs/with-editor-2.9.2
index 2969a4ea3ada..285033dff0a5 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.9.2
+++ b/metadata/md5-cache/app-emacs/with-editor-2.9.2
@@ -4,10 +4,11 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
 EAPI=7
 HOMEPAGE=https://magit.vc/manual/with-editor
+INHERIT=elisp
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.9.2.tar.gz -> with-editor-2.9.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=95e2c9c8935a7d4ef53919107814e862
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.9.4 b/metadata/md5-cache/app-emacs/with-editor-2.9.4
index 314cb5ea62e8..e6aa8f4ce940 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.9.4
+++ b/metadata/md5-cache/app-emacs/with-editor-2.9.4
@@ -4,10 +4,11 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
 EAPI=7
 HOMEPAGE=https://magit.vc/manual/with-editor
+INHERIT=elisp
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.9.4.tar.gz -> with-editor-2.9.4.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=95e2c9c8935a7d4ef53919107814e862
diff --git a/metadata/md5-cache/app-emacs/with-editor-3.0.2 b/metadata/md5-cache/app-emacs/with-editor-3.0.2
index 9308b24599b7..af9562ce2f20 100644
--- a/metadata/md5-cache/app-emacs/with-editor-3.0.2
+++ b/metadata/md5-cache/app-emacs/with-editor-3.0.2
@@ -4,10 +4,11 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
 EAPI=7
 HOMEPAGE=https://magit.vc/manual/with-editor
+INHERIT=elisp
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v3.0.2.tar.gz -> with-editor-3.0.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=55c0ad9eb1bde1495b35d393fedd9369
diff --git a/metadata/md5-cache/app-emacs/xclip-1.9 b/metadata/md5-cache/app-emacs/xclip-1.9
index 2f448ef89e98..4af67e785e81 100644
--- a/metadata/md5-cache/app-emacs/xclip-1.9
+++ b/metadata/md5-cache/app-emacs/xclip-1.9
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs Interface to XClip
 EAPI=7
 HOMEPAGE=https://elpa.gnu.org/packages/xclip.html
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=x11-misc/xclip >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xclip-1.9.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=57b70a562ce082462abc1dc0139f38f1
diff --git a/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1 b/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
index d476145bd206..3187454bdd97 100644
--- a/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
+++ b/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Emacs major mode for editing X resource database files
 EAPI=7
 HOMEPAGE=https://launchpad.net/xrdb-mode https://www.emacswiki.org/emacs/ResourceFiles
+INHERIT=elisp
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xrdb-mode-3.0.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=17f5122b6437dc01a28e212b9b84265f
diff --git a/metadata/md5-cache/app-emacs/xslide-0.2.2-r1 b/metadata/md5-cache/app-emacs/xslide-0.2.2-r1
index 12c92c52f76e..852211d9a4c7 100644
--- a/metadata/md5-cache/app-emacs/xslide-0.2.2-r1
+++ b/metadata/md5-cache/app-emacs/xslide-0.2.2-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Emacs major mode for editing XSL stylesheets and running XSL processes
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xslide/
+INHERIT=elisp
 KEYWORDS=~alpha amd64 ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/xslide/xslide-0.2.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=5fdb7ec5aa56571e886290e0813b71cb
diff --git a/metadata/md5-cache/app-emacs/yaml-mode-0.0.13 b/metadata/md5-cache/app-emacs/yaml-mode-0.0.13
index cd34c9f5536c..4057696cc5db 100644
--- a/metadata/md5-cache/app-emacs/yaml-mode-0.0.13
+++ b/metadata/md5-cache/app-emacs/yaml-mode-0.0.13
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=A major mode for GNU Emacs for editing YAML files
 EAPI=6
 HOMEPAGE=https://github.com/yoshiki/yaml-mode
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/yoshiki/yaml-mode/archive/v0.0.13.tar.gz -> yaml-mode-0.0.13.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=029b1ca777a1da09d6ec863765f4f768
diff --git a/metadata/md5-cache/app-emacs/yaml-mode-0.0.14 b/metadata/md5-cache/app-emacs/yaml-mode-0.0.14
index 3c3c132ebf9e..b25f1c86645d 100644
--- a/metadata/md5-cache/app-emacs/yaml-mode-0.0.14
+++ b/metadata/md5-cache/app-emacs/yaml-mode-0.0.14
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A major mode for GNU Emacs for editing YAML files
 EAPI=7
 HOMEPAGE=https://github.com/yoshiki/yaml-mode
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/yoshiki/yaml-mode/archive/0.0.14.tar.gz -> yaml-mode-0.0.14.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=b537b8a5f7a6b955104ba49d1def4dc4
diff --git a/metadata/md5-cache/app-emacs/yaml-mode-0.0.15 b/metadata/md5-cache/app-emacs/yaml-mode-0.0.15
index f5340145f8b0..dcba81925fd3 100644
--- a/metadata/md5-cache/app-emacs/yaml-mode-0.0.15
+++ b/metadata/md5-cache/app-emacs/yaml-mode-0.0.15
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A major mode for GNU Emacs for editing YAML files
 EAPI=7
 HOMEPAGE=https://github.com/yoshiki/yaml-mode
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/yoshiki/yaml-mode/archive/0.0.15.tar.gz -> yaml-mode-0.0.15.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=5f52e78d199c5b19c8e988b2ca48b0d2
diff --git a/metadata/md5-cache/app-emacs/yasnippet-0.13.0 b/metadata/md5-cache/app-emacs/yasnippet-0.13.0
index 096816913095..8dfddad2d746 100644
--- a/metadata/md5-cache/app-emacs/yasnippet-0.13.0
+++ b/metadata/md5-cache/app-emacs/yasnippet-0.13.0
@@ -3,11 +3,12 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Yet another snippet extension for Emacs
 EAPI=6
 HOMEPAGE=http://joaotavora.github.com/yasnippet/
+INHERIT=elisp readme.gentoo-r1
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/joaotavora/yasnippet/archive/0.13.0.tar.gz -> yasnippet-0.13.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=bd888dc018b439f9ef025d6d6d9c8afa
diff --git a/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3 b/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3
index 765c49c4bc8d..88ecffbae18f 100644
--- a/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3
+++ b/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A collection of yasnippet snippets for many languages
 EAPI=7
 HOMEPAGE=https://github.com/AndreaCrotti/yasnippet-snippets
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/yasnippet >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/AndreaCrotti/yasnippet-snippets/archive/0.3.tar.gz -> yasnippet-snippets-0.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=aa9a65c265773043b88e1e4239cd3d42
diff --git a/metadata/md5-cache/app-emacs/yatex-1.80 b/metadata/md5-cache/app-emacs/yatex-1.80
index 1db8769e7cfd..dfbfb143ca7d 100644
--- a/metadata/md5-cache/app-emacs/yatex-1.80
+++ b/metadata/md5-cache/app-emacs/yatex-1.80
@@ -3,11 +3,12 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Yet Another TeX mode for Emacs
 EAPI=6
 HOMEPAGE=http://www.yatex.org/
+INHERIT=elisp
 IUSE=l10n_ja
 KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.yatex.org/yatex1.80.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=89ba6ab186f306abd8e72e767d7f8c21
diff --git a/metadata/md5-cache/app-emacs/yc-4.0.13 b/metadata/md5-cache/app-emacs/yc-4.0.13
index ab28f5c41498..a0f4f203839e 100644
--- a/metadata/md5-cache/app-emacs/yc-4.0.13
+++ b/metadata/md5-cache/app-emacs/yc-4.0.13
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Yet another Canna client on Emacsen
 EAPI=6
 HOMEPAGE=http://www.ceres.dti.ne.jp/~knak/yc.html
+INHERIT=elisp toolchain-funcs
 KEYWORDS=~alpha ~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=app-i18n/canna >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.ceres.dti.ne.jp/~knak/yc-4.0.13.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=9fb935d7f79667cb3923f212985850db
diff --git a/metadata/md5-cache/app-emacs/yc-5.2.1 b/metadata/md5-cache/app-emacs/yc-5.2.1
index 361fb3fab45c..9417f091734b 100644
--- a/metadata/md5-cache/app-emacs/yc-5.2.1
+++ b/metadata/md5-cache/app-emacs/yc-5.2.1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=Yet another Canna client on Emacsen
 EAPI=6
 HOMEPAGE=http://www.ceres.dti.ne.jp/~knak/yc.html
+INHERIT=elisp
 KEYWORDS=~alpha ~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=app-i18n/canna >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.ceres.dti.ne.jp/~knak/yc-5.2.1.el.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=3f3e22fba959d3df0c008b9bee62491a
diff --git a/metadata/md5-cache/app-emacs/zenburn-20110907-r1 b/metadata/md5-cache/app-emacs/zenburn-20110907-r1
index 13261699b18b..b8c9526e62b2 100644
--- a/metadata/md5-cache/app-emacs/zenburn-20110907-r1
+++ b/metadata/md5-cache/app-emacs/zenburn-20110907-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Zenburn color theme for Emacs
 EAPI=7
 HOMEPAGE=https://web.archive.org/web/20140612104441/http://slinky.imukuppi.org/zenburnpage/ https://github.com/dbrock/zenburn-el
+INHERIT=elisp readme.gentoo-r1
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-emacs/color-theme >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/dbrock/zenburn-el/archive/2b0672b04ef3e95c25f849dceb10d669296a188b.tar.gz -> zenburn-20110907.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=fe565a3144e8e5005c6464547441fa30
diff --git a/metadata/md5-cache/app-emacs/zenirc-2.112-r1 b/metadata/md5-cache/app-emacs/zenirc-2.112-r1
index 405c31bb5eff..afe5a03502f5 100644
--- a/metadata/md5-cache/app-emacs/zenirc-2.112-r1
+++ b/metadata/md5-cache/app-emacs/zenirc-2.112-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=A full-featured scriptable IRC client for the Emacs text editor
 EAPI=5
 HOMEPAGE=http://www.zenirc.org/
+INHERIT=readme.gentoo elisp
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=ftp://ftp.zenirc.org/pub/zenirc/zenirc-2.112.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	elisp	00840e1f4eb277c757dbfa5abf73c4c7
 _md5_=73190e220769f4edb81899bc83450855
diff --git a/metadata/md5-cache/app-i18n/anthy-9100h-r2 b/metadata/md5-cache/app-i18n/anthy-9100h-r2
index 1b5f15ba2d79..84a8a482a13a 100644
--- a/metadata/md5-cache/app-i18n/anthy-9100h-r2
+++ b/metadata/md5-cache/app-i18n/anthy-9100h-r2
@@ -3,11 +3,12 @@ DEFINED_PHASES=configure install postinst postrm prepare
 DESCRIPTION=Anthy -- free and secure Japanese input system
 EAPI=7
 HOMEPAGE=http://anthy.osdn.jp/
+INHERIT=elisp-common
 IUSE=canna-2ch emacs static-libs
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=canna-2ch? ( app-dicts/canna-2ch ) emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/anthy/37536/anthy-9100h.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=19b43decca4686ac9959a14b1a06c72c
diff --git a/metadata/md5-cache/app-i18n/mozc-2.23.2815.102 b/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
index 953eadf82d60..d3e687222944 100644
--- a/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
+++ b/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/protobuf-3.0.0:= emacs? ( app-editors/emacs:* ) fcitx4? ( app-
 DESCRIPTION=Mozc - Japanese input method editor
 EAPI=7
 HOMEPAGE=https://github.com/google/mozc
+INHERIT=elisp-common multiprocessing python-any-r1 toolchain-funcs
 IUSE=debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=BSD BSD-2 ipadic public-domain unicode
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/mozc/archive/afb03ddfe72dde4cf2409863a3bfea160f7a66d8.tar.gz -> mozc-2.23.2815.102.tar.gz https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.tar.gz -> japanese-usage-dictionary-20120416091336.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.23.2815.102.1.patch )
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=6bfdb34ee539346f3f1a3a50b75ad47b
diff --git a/metadata/md5-cache/app-i18n/mozc-2.26.4220_p20201212102434_p20201219202429 b/metadata/md5-cache/app-i18n/mozc-2.26.4220_p20201212102434_p20201219202429
index d262753b7a93..fa9c3d0b4251 100644
--- a/metadata/md5-cache/app-i18n/mozc-2.26.4220_p20201212102434_p20201219202429
+++ b/metadata/md5-cache/app-i18n/mozc-2.26.4220_p20201212102434_p20201219202429
@@ -4,6 +4,7 @@ DEPEND=>=dev-cpp/abseil-cpp-20200923[cxx17(+)] >=dev-libs/protobuf-3.0.0:= fcitx
 DESCRIPTION=Mozc - Japanese input method editor
 EAPI=7
 HOMEPAGE=https://github.com/google/mozc
+INHERIT=elisp-common multiprocessing python-any-r1 toolchain-funcs
 IUSE=debug emacs fcitx4 +gui ibus renderer test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD BSD-2 ipadic public-domain unicode
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( emacs fcitx4 ibus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/mozc/archive/9ba59b64d53365c1fe93c1c245b4ec3e35bdadf0.tar.gz -> mozc-2.26.4220-20201212102434.tar.gz https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/a4a66772e33746b91e99caceecced9a28507e925.tar.gz -> japanese-usage-dictionary-20180701040110.tar.gz fcitx4? ( https://github.com/fcitx/mozc/archive/1ea089debc31ff216473369ad71c08318384ee06.tar.gz -> fcitx-mozc-2.26.4220-20201219202429.tar.gz )
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=ee82b04db8a99b1bcf4db3039ecba600
diff --git a/metadata/md5-cache/app-i18n/mozc-9999 b/metadata/md5-cache/app-i18n/mozc-9999
index c07c08748be4..f7aeb056a200 100644
--- a/metadata/md5-cache/app-i18n/mozc-9999
+++ b/metadata/md5-cache/app-i18n/mozc-9999
@@ -4,6 +4,7 @@ DEPEND=>=dev-cpp/abseil-cpp-20200923[cxx17(+)] >=dev-libs/protobuf-3.0.0:= fcitx
 DESCRIPTION=Mozc - Japanese input method editor
 EAPI=7
 HOMEPAGE=https://github.com/google/mozc
+INHERIT=elisp-common multiprocessing python-any-r1 toolchain-funcs git-r3
 IUSE=debug emacs fcitx4 +gui ibus renderer test
 LICENSE=BSD BSD-2 ipadic public-domain unicode
 PROPERTIES=live
@@ -11,5 +12,5 @@ RDEPEND=>=dev-cpp/abseil-cpp-20200923[cxx17(+)] >=dev-libs/protobuf-3.0.0:= emac
 REQUIRED_USE=|| ( emacs fcitx4 ibus )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=573905c3db4bc9adedf4b0cacefa8ea4
diff --git a/metadata/md5-cache/app-i18n/skktools-1.3.3_p20170305 b/metadata/md5-cache/app-i18n/skktools-1.3.3_p20170305
index c7fc1be64328..5fb1f41b0330 100644
--- a/metadata/md5-cache/app-i18n/skktools-1.3.3_p20170305
+++ b/metadata/md5-cache/app-i18n/skktools-1.3.3_p20170305
@@ -3,11 +3,12 @@ DEPEND=dev-libs/glib:2 sys-libs/gdbm emacs? ( >=app-editors/emacs-23.1:* ) virtu
 DESCRIPTION=SKK utilities to manage dictionaries
 EAPI=6
 HOMEPAGE=http://openlab.jp/skk/
+INHERIT=elisp-common vcs-snapshot
 IUSE=emacs
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/gdbm emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=https://github.com/skk-dev/skktools/archive/e14d98e734d2fdff611385c7df65826e94d929db.tar.gz -> skktools-1.3.3_p20170305.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=e3c76444f48c10e4c9ef34a6107ea976
diff --git a/metadata/md5-cache/app-i18n/skktools-1.3.4 b/metadata/md5-cache/app-i18n/skktools-1.3.4
index 6b47a35e70ad..cbf0b885ff8a 100644
--- a/metadata/md5-cache/app-i18n/skktools-1.3.4
+++ b/metadata/md5-cache/app-i18n/skktools-1.3.4
@@ -3,11 +3,12 @@ DEPEND=dev-libs/glib:2 sys-libs/gdbm emacs? ( >=app-editors/emacs-23.1:* ) virtu
 DESCRIPTION=SKK utilities to manage dictionaries
 EAPI=6
 HOMEPAGE=http://openlab.jp/skk/
+INHERIT=elisp-common vcs-snapshot
 IUSE=emacs
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/gdbm emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=https://github.com/skk-dev/skktools/archive/skktools-1_3_4.tar.gz -> skktools-1.3.4.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=1b03ee8e809c2cba352c6b88a88cdefa
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.8 b/metadata/md5-cache/app-i18n/uim-1.8.8
index 2d762ed052d2..a1d1bf996549 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.8
+++ b/metadata/md5-cache/app-i18n/uim-1.8.8
@@ -13,5 +13,5 @@ REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt5? ( X ) xft? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/uim/uim/releases/download/1.8.8/uim-1.8.8.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47
 _md5_=5a69f196fc3d560755faf01af22b2f6a
diff --git a/metadata/md5-cache/app-misc/cdargs-1.35-r2 b/metadata/md5-cache/app-misc/cdargs-1.35-r2
index 5c76be2269a0..9c5547d72ba6 100644
--- a/metadata/md5-cache/app-misc/cdargs-1.35-r2
+++ b/metadata/md5-cache/app-misc/cdargs-1.35-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=http://www.skamphausen.de/software/cdargs/cdargs-1.35.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=cecbe30c4bf8d80065f7814ea57eda96
diff --git a/metadata/md5-cache/app-misc/gtypist-2.9.5-r1 b/metadata/md5-cache/app-misc/gtypist-2.9.5-r1
index 73307e17aa13..5da730b026ad 100644
--- a/metadata/md5-cache/app-misc/gtypist-2.9.5-r1
+++ b/metadata/md5-cache/app-misc/gtypist-2.9.5-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2 public-domain
 RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* ) xemacs? ( !emacs? ( app-editors/xemacs app-xemacs/fsf-compat ) )
 SLOT=0
 SRC_URI=mirror://gnu/gtypist/gtypist-2.9.5.tar.xz http://colemak.com/pub/learn/colemak.typ
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=c1a2ec824b4ae4cf4e4415cf96f50261
diff --git a/metadata/md5-cache/app-misc/logiops-0.2.2 b/metadata/md5-cache/app-misc/logiops-0.2.2
index c14869f48646..f0d537174a9f 100644
--- a/metadata/md5-cache/app-misc/logiops-0.2.2
+++ b/metadata/md5-cache/app-misc/logiops-0.2.2
@@ -1,14 +1,15 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=dev-libs/libconfig:= dev-libs/libevdev virtual/libudev systemd? ( sys-apps/systemd )
+DEPEND=dev-libs/libconfig:=[cxx] dev-libs/libevdev virtual/libudev systemd? ( sys-apps/systemd )
 DESCRIPTION=An unofficial userspace driver for HID++ Logitech devices
 EAPI=7
 HOMEPAGE=https://github.com/PixlOne/logiops
+INHERIT=cmake linux-info
 IUSE=systemd kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=dev-libs/libconfig:= dev-libs/libevdev virtual/libudev systemd? ( sys-apps/systemd )
+RDEPEND=dev-libs/libconfig:=[cxx] dev-libs/libevdev virtual/libudev systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/PixlOne/logiops/archive/v0.2.2.tar.gz -> logiops-0.2.2.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a5c9e7a204517e3da22cf89966c783ac
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	linux-info	c90a203b1c14cfa77bd3e37a0e96c955
+_md5_=c381ed64c43397d4105748d4f568cea2
diff --git a/metadata/md5-cache/app-misc/logiops-0.2.2_p20200108 b/metadata/md5-cache/app-misc/logiops-0.2.2_p20200108
index 7299f3c0c508..b4fefe2ec9fa 100644
--- a/metadata/md5-cache/app-misc/logiops-0.2.2_p20200108
+++ b/metadata/md5-cache/app-misc/logiops-0.2.2_p20200108
@@ -1,14 +1,15 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=dev-libs/libconfig:= dev-libs/libevdev virtual/libudev systemd? ( sys-apps/systemd )
+DEPEND=dev-libs/libconfig:=[cxx] dev-libs/libevdev virtual/libudev systemd? ( sys-apps/systemd )
 DESCRIPTION=An unofficial userspace driver for HID++ Logitech devices
 EAPI=7
 HOMEPAGE=https://github.com/PixlOne/logiops
+INHERIT=cmake linux-info
 IUSE=systemd kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=dev-libs/libconfig:= dev-libs/libevdev virtual/libudev systemd? ( sys-apps/systemd )
+RDEPEND=dev-libs/libconfig:=[cxx] dev-libs/libevdev virtual/libudev systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/PixlOne/logiops/archive/a0687c8f18e312824ac04043c410b637ce89e371.tar.gz -> logiops-0.2.2_p20200108.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eab7f385df74b104c69e00ebb17739bb
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	linux-info	c90a203b1c14cfa77bd3e37a0e96c955
+_md5_=bb7109f0d8c8a9208c07177f748e6bde
diff --git a/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1 b/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1
index fca0c0db4b64..8d2831f609b8 100644
--- a/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1
+++ b/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXmu imlib
 REQUIRED_USE=imlib? ( !gif !png )
 SLOT=0
 SRC_URI=ftp://sh.wide.ad.jp/WIDE/free-ware/mgp-snap/mgp-snap-20121015.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=813d41c60a085f55b818185fc51ba55c
diff --git a/metadata/md5-cache/app-text/a2ps-4.14-r6 b/metadata/md5-cache/app-text/a2ps-4.14-r6
index 4626c4aec2f5..25f96d4c82de 100644
--- a/metadata/md5-cache/app-text/a2ps-4.14-r6
+++ b/metadata/md5-cache/app-text/a2ps-4.14-r6
@@ -11,5 +11,5 @@ RDEPEND=app-text/ghostscript-gpl app-text/libpaper >=app-text/psutils-1.17 app-t
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/a2ps/a2ps-4.14.tar.gz cjk? ( mirror://gentoo/a2ps-4.14-ja_nls.patch.gz )
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=14d3093ea77bcda6528d8383d51cd4ae
diff --git a/metadata/md5-cache/app-text/namazu-2.0.21 b/metadata/md5-cache/app-text/namazu-2.0.21
index 1bb5c6db804a..4f8470ba8708 100644
--- a/metadata/md5-cache/app-text/namazu-2.0.21
+++ b/metadata/md5-cache/app-text/namazu-2.0.21
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/File-MMagic emacs? ( >=app-editors/emacs-23.1:* ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx )
 SLOT=0
 SRC_URI=http://www.namazu.org/stable/namazu-2.0.21.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=7ac16842d15e862afddde5cdcc2dd8eb
diff --git a/metadata/md5-cache/app-text/namazu-2.0.22_pre7 b/metadata/md5-cache/app-text/namazu-2.0.22_pre7
index c598e9b46c42..244fc7764297 100644
--- a/metadata/md5-cache/app-text/namazu-2.0.22_pre7
+++ b/metadata/md5-cache/app-text/namazu-2.0.22_pre7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/File-MMagic emacs? ( >=app-editors/emacs-23.1:* ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx )
 SLOT=0
 SRC_URI=http://www.namazu.org/test/namazu-2.0.22pre7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=7c83a1517db606b27a96b3fa0e3e0ab3
diff --git a/metadata/md5-cache/app-text/xdvik-22.87.03-r2 b/metadata/md5-cache/app-text/xdvik-22.87.03-r2
index 6035b73e35a4..8cbe76292582 100644
--- a/metadata/md5-cache/app-text/xdvik-22.87.03-r2
+++ b/metadata/md5-cache/app-text/xdvik-22.87.03-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt emacs? ( >=app-editors/emacs-23.1:* ) motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea virtual/latex-base !<app-text/texlive-2007
 SLOT=0
 SRC_URI=mirror://sourceforge/xdvi/xdvik-22.87.03.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b104bcbaf92f88bd5118db4f9ce6140c
diff --git a/metadata/md5-cache/dev-cpp/ctemplate-2.4 b/metadata/md5-cache/dev-cpp/ctemplate-2.4
index 1e846faf1f7c..3a74c93df971 100644
--- a/metadata/md5-cache/dev-cpp/ctemplate-2.4
+++ b/metadata/md5-cache/dev-cpp/ctemplate-2.4
@@ -12,5 +12,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( >=app-editors/vim-co
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OlafvdSpek/ctemplate/archive/ctemplate-2.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=9eb528c7c0d65105b21a0c40b7f3e146
diff --git a/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1 b/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1
index 74c9aa970322..e0648d126dfc 100644
--- a/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1
+++ b/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1
@@ -3,11 +3,12 @@ DEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] >=dev-haskell/ansi-terminal-0.6.2
 DESCRIPTION=Source code suggestions
 EAPI=7
 HOMEPAGE=https://github.com/ndmitchell/hlint#readme
+INHERIT=haskell-cabal elisp-common
 IUSE=emacs +gpl doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] >=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/cmdargs-0.10:=[profile?] >=dev-haskell/cpphs-1.20.1:=[profile?] >=dev-haskell/data-default-0.3:=[profile?] >=dev-haskell/extra-1.6.6:=[profile?] dev-haskell/haskell-src-exts:1.21=[profile?] >=dev-haskell/haskell-src-exts-util-0.2.5:=[profile?] >=dev-haskell/refact-0.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-haskell/yaml-0.5.0:=[profile?] >=dev-lang/ghc-7.10.1:= gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
 SLOT=0/2.1.17
 SRC_URI=https://hackage.haskell.org/package/hlint-2.1.17/hlint-2.1.17.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=2098cdc98fc0e87a82bc4154ba4b8931
diff --git a/metadata/md5-cache/dev-lang/c-intercal-31.0 b/metadata/md5-cache/dev-lang/c-intercal-31.0
index bff35045e334..1ad7df46e59d 100644
--- a/metadata/md5-cache/dev-lang/c-intercal-31.0
+++ b/metadata/md5-cache/dev-lang/c-intercal-31.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/intercal/intercal-0.31.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=6efac9b6271a5b52807b7e74901523da
diff --git a/metadata/md5-cache/dev-lang/erlang-23.0.4 b/metadata/md5-cache/dev-lang/erlang-23.0.4
index a0e4a1b5a2d9..13bdc372b34c 100644
--- a/metadata/md5-cache/dev-lang/erlang-23.0.4
+++ b/metadata/md5-cache/dev-lang/erlang-23.0.4
@@ -4,11 +4,12 @@ DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? (
 DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=7
 HOMEPAGE=https://www.erlang.org/
+INHERIT=elisp-common java-pkg-opt-2 systemd wxwidgets
 IUSE=doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/23.0.4
 SRC_URI=https://github.com/erlang/otp/archive/OTP-23.0.4.tar.gz -> erlang-23.0.4.tar.gz http://erlang.org/download/otp_doc_man_23.0.tar.gz -> erlang_doc_man_23.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.0.tar.gz -> erlang_doc_html_23.0.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=0f550b9577753c04819217686a933717
diff --git a/metadata/md5-cache/dev-lang/erlang-23.2.3 b/metadata/md5-cache/dev-lang/erlang-23.2.3
index bf1f2835f7bd..82288fd3303c 100644
--- a/metadata/md5-cache/dev-lang/erlang-23.2.3
+++ b/metadata/md5-cache/dev-lang/erlang-23.2.3
@@ -4,11 +4,12 @@ DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? (
 DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=7
 HOMEPAGE=https://www.erlang.org/
+INHERIT=elisp-common java-pkg-opt-2 systemd wxwidgets
 IUSE=doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/23.2.3
 SRC_URI=https://github.com/erlang/otp/archive/OTP-23.2.3.tar.gz -> erlang-23.2.3.tar.gz http://erlang.org/download/otp_doc_man_23.2.tar.gz -> erlang_doc_man_23.2.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.2.tar.gz -> erlang_doc_html_23.2.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=8327b5fea414cdc0e5a9e16449c303ec
diff --git a/metadata/md5-cache/dev-lang/erlang-23.2.7 b/metadata/md5-cache/dev-lang/erlang-23.2.7
index d8d4a6f5afa0..e4e3df5e0eb9 100644
--- a/metadata/md5-cache/dev-lang/erlang-23.2.7
+++ b/metadata/md5-cache/dev-lang/erlang-23.2.7
@@ -4,11 +4,12 @@ DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? (
 DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=7
 HOMEPAGE=https://www.erlang.org/
+INHERIT=elisp-common java-pkg-opt-2 systemd wxwidgets
 IUSE=doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/23.2.7
 SRC_URI=https://github.com/erlang/otp/archive/OTP-23.2.7.tar.gz -> erlang-23.2.7.tar.gz http://erlang.org/download/otp_doc_man_23.2.tar.gz -> erlang_doc_man_23.2.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.2.tar.gz -> erlang_doc_html_23.2.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=4e4a10c0d1eeccf12a5815591680f67b
diff --git a/metadata/md5-cache/dev-lang/gforth-0.7.3-r1 b/metadata/md5-cache/dev-lang/gforth-0.7.3-r1
index 6e4dc9467cfd..f31128c407b1 100644
--- a/metadata/md5-cache/dev-lang/gforth-0.7.3-r1
+++ b/metadata/md5-cache/dev-lang/gforth-0.7.3-r1
@@ -3,11 +3,12 @@ DEPEND=dev-libs/ffcall emacs? ( >=app-editors/emacs-23.1:* )
 DESCRIPTION=GNU Forth is a fast and portable implementation of the ANSI Forth language
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gforth
+INHERIT=elisp-common
 IUSE=+check emacs
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=dev-libs/ffcall emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://gnu/gforth/gforth-0.7.3.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=7725916e4a9058691242d9015aa39fcc
diff --git a/metadata/md5-cache/dev-lang/lfe-1.3.0_p20210112 b/metadata/md5-cache/dev-lang/lfe-1.3.0_p20210112
index a7595457349f..3338fc7b6310 100644
--- a/metadata/md5-cache/dev-lang/lfe-1.3.0_p20210112
+++ b/metadata/md5-cache/dev-lang/lfe-1.3.0_p20210112
@@ -4,6 +4,7 @@ DEPEND=dev-lang/erlang doc? ( app-text/pandoc )
 DESCRIPTION=Lisp-flavoured Erlang
 EAPI=7
 HOMEPAGE=http://lfe.github.io/
+INHERIT=elisp-common toolchain-funcs
 IUSE=doc emacs
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ RDEPEND=dev-lang/erlang
 RESTRICT=mirror test
 SLOT=0
 SRC_URI=https://github.com/rvirding/lfe/archive/e5f20c459a13b35ed1e71b1d2667363af168e958.zip -> lfe-1.3.0_p20210112.zip
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=7417a8467c4d55ea5627db32b9c4a600
diff --git a/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2 b/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2
index c67ed9cad286..874ce2c46f43 100644
--- a/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2
+++ b/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2
@@ -3,11 +3,12 @@ DEPEND=vim-syntax? ( app-editors/vim ) emacs? ( >=app-editors/emacs-23.1:* )
 DESCRIPTION=An object prototype based language
 EAPI=7
 HOMEPAGE=http://isaacproject.u-strasbg.fr/li.html
+INHERIT=elisp-common toolchain-funcs
 IUSE=vim-syntax emacs examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=vim-syntax? ( app-editors/vim ) emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=http://isaacproject.u-strasbg.fr/download/lisaac-0.13.1.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=869b91654ce56a5adce08ce0c225679a
diff --git a/metadata/md5-cache/dev-lang/mercury-20.06 b/metadata/md5-cache/dev-lang/mercury-20.06
index 222ab9000dce..76d944009d6f 100644
--- a/metadata/md5-cache/dev-lang/mercury-20.06
+++ b/metadata/md5-cache/dev-lang/mercury-20.06
@@ -11,5 +11,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.6:= ) mono? ( dev-lang/mono ) doc? ( sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://dl.mercurylang.org/release-20.06/mercury-srcdist-20.06.tar.gz https://dev.gentoo.org/~keri/distfiles/mercury/mercury-20.06-gentoo-patchset-1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=92546f607ad12c5df3471b602381460e
diff --git a/metadata/md5-cache/dev-lang/teyjus-2.1 b/metadata/md5-cache/dev-lang/teyjus-2.1
index 7ed9258b09f0..72466ba2cedd 100644
--- a/metadata/md5-cache/dev-lang/teyjus-2.1
+++ b/metadata/md5-cache/dev-lang/teyjus-2.1
@@ -3,11 +3,12 @@ DEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.1
 DESCRIPTION=Higher-order logic programming language Lambda Prolog
 EAPI=6
 HOMEPAGE=http://teyjus.cs.umn.edu/
+INHERIT=elisp-common multilib versionator
 IUSE=emacs examples +ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.10[ocamlopt?] emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0/2.1
 SRC_URI=https://github.com/teyjus/teyjus/archive/v2.1.tar.gz -> teyjus-2.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=5070c03cafa714de321e27f21715a0bb
diff --git a/metadata/md5-cache/dev-lang/teyjus-2.1-r1 b/metadata/md5-cache/dev-lang/teyjus-2.1-r1
index 8540d3d6226a..74c6d85492f8 100644
--- a/metadata/md5-cache/dev-lang/teyjus-2.1-r1
+++ b/metadata/md5-cache/dev-lang/teyjus-2.1-r1
@@ -3,11 +3,12 @@ DEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.1
 DESCRIPTION=Higher-order logic programming language Lambda Prolog
 EAPI=7
 HOMEPAGE=http://teyjus.cs.umn.edu/
+INHERIT=elisp-common multilib
 IUSE=emacs examples +ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.10[ocamlopt?] emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0/2.1
 SRC_URI=https://github.com/teyjus/teyjus/archive/v2.1.tar.gz -> teyjus-2.1.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b34cd250fa85ef4700126e4c3d3f4372
diff --git a/metadata/md5-cache/dev-libs/librep-0.92.7 b/metadata/md5-cache/dev-libs/librep-0.92.7
index 9d309f7485e2..c4e639f02a61 100644
--- a/metadata/md5-cache/dev-libs/librep-0.92.7
+++ b/metadata/md5-cache/dev-libs/librep-0.92.7
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/gdbm-1.8.0 emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/librep/librep_0.92.7.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=ba884cd0bd7328949bf3b7caf7b7fff4
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.12.2 b/metadata/md5-cache/dev-libs/protobuf-3.12.2
index e5fa19db4b4d..58e9429e8662 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.12.2
+++ b/metadata/md5-cache/dev-libs/protobuf-3.12.2
@@ -12,5 +12,5 @@ RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_
 RESTRICT=!test? ( test )
 SLOT=0/23
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.2.tar.gz -> protobuf-3.12.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
 _md5_=1a513b9681f4070f670de835d12a4f1a
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.12.4 b/metadata/md5-cache/dev-libs/protobuf-3.12.4
index 59e71ed05d1b..d88916ece57b 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.12.4
+++ b/metadata/md5-cache/dev-libs/protobuf-3.12.4
@@ -12,5 +12,5 @@ RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_
 RESTRICT=!test? ( test )
 SLOT=0/23
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.4.tar.gz -> protobuf-3.12.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
 _md5_=6945bba11ec6d12701f9c1b548e3ef1f
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.13.0 b/metadata/md5-cache/dev-libs/protobuf-3.13.0
index cbc8d0ac0832..3c6cf05a567d 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.13.0
+++ b/metadata/md5-cache/dev-libs/protobuf-3.13.0
@@ -12,5 +12,5 @@ RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_
 RESTRICT=!test? ( test )
 SLOT=0/24
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz -> protobuf-3.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
 _md5_=0c2af5167e2d036495619964c185b4c1
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.14.0 b/metadata/md5-cache/dev-libs/protobuf-3.14.0
index e11a9fef082f..38300a27461c 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.14.0
+++ b/metadata/md5-cache/dev-libs/protobuf-3.14.0
@@ -12,5 +12,5 @@ RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.14.0.tar.gz -> protobuf-3.14.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
 _md5_=4d434eb3cab2c166fb2ff0a759f65972
diff --git a/metadata/md5-cache/dev-libs/protobuf-9999 b/metadata/md5-cache/dev-libs/protobuf-9999
index 0bf09201dc46..e45124e73c24 100644
--- a/metadata/md5-cache/dev-libs/protobuf-9999
+++ b/metadata/md5-cache/dev-libs/protobuf-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/25
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=f38a81f67cd62567c8a3f72a4c46a595
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.10 b/metadata/md5-cache/dev-lisp/gcl-2.6.10
index 15298f9fbe9a..eb87a188592f 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.10
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.10
@@ -3,6 +3,7 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) readline? ( sys-libs/readline:= ) a
 DESCRIPTION=GNU Common Lisp
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gcl/gcl.html
+INHERIT=elisp-common eutils flag-o-matic
 IUSE=+ansi athena emacs +readline tk X
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2 GPL-2
@@ -10,5 +11,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) readline? ( sys-libs/readline:= )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gnu/gcl/gcl-2.6.10.tar.gz https://dev.gentoo.org/~grozin/gcl-2.6.10-fedora.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=784dfc8d754e43a36dc2c042b5145f8f
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.12 b/metadata/md5-cache/dev-lisp/gcl-2.6.12
index 46bb1ef385ab..5eb646e10380 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.12
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.12
@@ -3,6 +3,7 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) readline? ( sys-libs/readline:= ) a
 DESCRIPTION=GNU Common Lisp
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gcl/gcl.html
+INHERIT=elisp-common eutils flag-o-matic
 IUSE=+ansi athena emacs +readline tk X
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2 GPL-2
@@ -10,5 +11,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) readline? ( sys-libs/readline:= )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gnu/gcl/gcl-2.6.12.tar.gz https://dev.gentoo.org/~grozin/gcl-2.6.12-fedora.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=683a39a62bea51a52c5226b965dfc10b
diff --git a/metadata/md5-cache/dev-ml/merlin-3.4.2-r1 b/metadata/md5-cache/dev-ml/merlin-3.4.2-r1
index 973e37df9735..a7d5c69bc3ae 100644
--- a/metadata/md5-cache/dev-ml/merlin-3.4.2-r1
+++ b/metadata/md5-cache/dev-ml/merlin-3.4.2-r1
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/csexp:= dev-ml/yojson:= >=dev-lang/ocaml-4.09:= <dev-lang/ocaml-4.12:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/3.4.2
 SRC_URI=https://github.com/ocaml/merlin/archive/v3.4.2.tar.gz -> merlin-3.4.2.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	dune	46e13a2340ab32b2ad8ae98b653695ea
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	dune	46e13a2340ab32b2ad8ae98b653695ea
 _md5_=8a5a0751184bc93d507186e699808717
diff --git a/metadata/md5-cache/dev-ml/merlin-4.1-r1 b/metadata/md5-cache/dev-ml/merlin-4.1-r1
index f10958ab459a..8e568c2adc5c 100644
--- a/metadata/md5-cache/dev-ml/merlin-4.1-r1
+++ b/metadata/md5-cache/dev-ml/merlin-4.1-r1
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=app-emacs/auto-complete app-emacs/company-mode dev-ml/csexp:= dev-ml/yojson:= =dev-lang/ocaml-4.11*:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/4.1
 SRC_URI=https://github.com/ocaml/merlin/archive/v4.1.tar.gz -> merlin-4.1.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	dune	46e13a2340ab32b2ad8ae98b653695ea
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	dune	46e13a2340ab32b2ad8ae98b653695ea
 _md5_=7f716c102d084462d26dda1ba0a5c044
diff --git a/metadata/md5-cache/dev-perl/Emacs-PDE-0.2.17 b/metadata/md5-cache/dev-perl/Emacs-PDE-0.2.17
index bc89205fd0d7..dacdd8e02c72 100644
--- a/metadata/md5-cache/dev-perl/Emacs-PDE-0.2.17
+++ b/metadata/md5-cache/dev-perl/Emacs-PDE-0.2.17
@@ -4,10 +4,11 @@ DEPEND=dev-perl/Module-Build dev-lang/perl
 DESCRIPTION=Perl Develop Environment in Emacs
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Emacs-PDE
+INHERIT=perl-module elisp-common
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ ) GPL-2+ FDL-1.1+
 RDEPEND=>=app-editors/emacs-23.1:* dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YE/YEWENBIN/Emacs-PDE-v0.2.17.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=71af4aab61634d84ddfe5e7612348c53
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0 b/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
index f7e84f57d09a..f285a5bb991a 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
@@ -3,6 +3,7 @@ DEPEND=>=dev-perl/B-Keywords-1.50.0 virtual/perl-Carp >=dev-perl/Config-Tiny-2 >
 DESCRIPTION=Critique Perl source code for best-practices
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Perl-Critic
+INHERIT=perl-module elisp-common
 IUSE=test minimal examples emacs
 KEYWORDS=~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
@@ -10,5 +11,5 @@ RDEPEND=>=dev-perl/B-Keywords-1.50.0 virtual/perl-Carp >=dev-perl/Config-Tiny-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.130.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=5c16ca0e191ad44195488f5fe993025d
diff --git a/metadata/md5-cache/dev-python/cython-0.29.21 b/metadata/md5-cache/dev-python/cython-0.29.21
index dd338a4eda31..e7e17e2682cc 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.21
+++ b/metadata/md5-cache/dev-python/cython-0.29.21
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DESCRIPTION=A Python to C compiler
 EAPI=7
 HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
+INHERIT=distutils-r1 toolchain-funcs elisp-common
 IUSE=emacs test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.21.tar.gz -> cython-0.29.21.gh.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=f8ea807eb63c32dd28b66fb728c3276a
diff --git a/metadata/md5-cache/dev-python/cython-0.29.21-r1 b/metadata/md5-cache/dev-python/cython-0.29.21-r1
index 0bdcf866e8ad..365c28fbe6cd 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.21-r1
+++ b/metadata/md5-cache/dev-python/cython-0.29.21-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DESCRIPTION=A Python to C compiler
 EAPI=7
 HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
+INHERIT=distutils-r1 toolchain-funcs elisp-common
 IUSE=emacs test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.21.tar.gz -> cython-0.29.21.gh.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=da93e472f6a940c3f128d79a9d8360f1
diff --git a/metadata/md5-cache/dev-python/cython-0.29.22 b/metadata/md5-cache/dev-python/cython-0.29.22
index baedb4aa0b13..bd34f960c9cb 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.22
+++ b/metadata/md5-cache/dev-python/cython-0.29.22
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DESCRIPTION=A Python to C compiler
 EAPI=7
 HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
+INHERIT=distutils-r1 toolchain-funcs elisp-common
 IUSE=emacs test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.22.tar.gz -> cython-0.29.22.gh.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=d64df0abf5f2fdff41a7f97910afe4e3
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
index 4740b3924902..71ae366ba21d 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
@@ -3,6 +3,7 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=A multipurpose documentation format for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/uwabami/rdtool
+INHERIT=elisp-common ruby-fakegem
 IUSE=emacs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=Ruby GPL-2
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdtool-0.6.38.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd
 _md5_=7732ac483460ba34953095ba5a2fe53f
diff --git a/metadata/md5-cache/dev-scheme/gambit-4.8.8-r1 b/metadata/md5-cache/dev-scheme/gambit-4.8.8-r1
index 3ae008d82654..91d72297a2cc 100644
--- a/metadata/md5-cache/dev-scheme/gambit-4.8.8-r1
+++ b/metadata/md5-cache/dev-scheme/gambit-4.8.8-r1
@@ -3,11 +3,12 @@ DEPEND=ssl? ( dev-libs/openssl:0 ) emacs? ( >=app-editors/emacs-23.1:* )
 DESCRIPTION=Gambit-C is a native Scheme to C compiler and interpreter
 EAPI=6
 HOMEPAGE=http://www.iro.umontreal.ca/~gambit/
+INHERIT=eutils elisp-common
 IUSE=emacs ssl static
 KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RDEPEND=ssl? ( dev-libs/openssl:0 )
 SLOT=0
 SRC_URI=http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_8.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=ae91f7a1ff23cbd335bfefa082209e55
diff --git a/metadata/md5-cache/dev-scheme/gambit-4.8.8-r2 b/metadata/md5-cache/dev-scheme/gambit-4.8.8-r2
index 15e99aaed605..01dc1c2c8907 100644
--- a/metadata/md5-cache/dev-scheme/gambit-4.8.8-r2
+++ b/metadata/md5-cache/dev-scheme/gambit-4.8.8-r2
@@ -3,11 +3,12 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0
 DESCRIPTION=Gambit-C is a native Scheme to C compiler and interpreter
 EAPI=6
 HOMEPAGE=http://www.iro.umontreal.ca/~gambit/
+INHERIT=eutils elisp-common
 IUSE=emacs libressl ssl static
 KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_8.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=547b776c2c54063342d57e712b28d3b7
diff --git a/metadata/md5-cache/dev-scheme/gambit-4.9.3 b/metadata/md5-cache/dev-scheme/gambit-4.9.3
index 78ba971f9775..7cd9209e3667 100644
--- a/metadata/md5-cache/dev-scheme/gambit-4.9.3
+++ b/metadata/md5-cache/dev-scheme/gambit-4.9.3
@@ -4,11 +4,12 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0
 DESCRIPTION=Gambit-C is a native Scheme to C compiler and interpreter
 EAPI=7
 HOMEPAGE=http://www.iro.umontreal.ca/~gambit/
+INHERIT=eutils elisp-common
 IUSE=emacs libressl ssl static
 KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=0ed75a92541658a3a9483b6abf1e6f28
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.8-r3 b/metadata/md5-cache/dev-scheme/guile-1.8.8-r3
index 4abfa18167fd..94f4efdd8df7 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.8-r3
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.8-r3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.1:0= dev-libs/libltdl:0= sys-devel/gettext sys-libs/ncu
 RESTRICT=!regex? ( test )
 SLOT=12/8
 SRC_URI=mirror://gnu/guile/guile-1.8.8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=665437a442e90c6ab65d6fba7eed30c3
diff --git a/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1 b/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1
index 3fa5d9e7cee2..760b52e5871d 100644
--- a/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1
+++ b/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1
@@ -3,11 +3,12 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* )
 DESCRIPTION=Scheme48 is an implementation of the Scheme Programming Language
 EAPI=5
 HOMEPAGE=http://www.s48.org/
+INHERIT=elisp-common multilib eutils flag-o-matic
 IUSE=doc emacs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=http://www.s48.org/1.9.2/scheme48-1.9.2.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=7627a60623febe4ea4a607e907dbf6f2
diff --git a/metadata/md5-cache/dev-util/cflow-1.6 b/metadata/md5-cache/dev-util/cflow-1.6
index 82b94521b39a..4801a7aea8ad 100644
--- a/metadata/md5-cache/dev-util/cflow-1.6
+++ b/metadata/md5-cache/dev-util/cflow-1.6
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm
 DESCRIPTION=C function call hierarchy analyzer
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/cflow/
+INHERIT=elisp-common
 IUSE=debug emacs nls
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) nls? ( virtual/libintl virtual/libiconv )
 SLOT=0
 SRC_URI=http://ftp.gnu.org/gnu/cflow/cflow-1.6.tar.bz2
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=367a7fdde5606a67accd669360171fb6
diff --git a/metadata/md5-cache/dev-util/cmake-3.13.5 b/metadata/md5-cache/dev-util/cmake-3.13.5
index 162ffaa03391..4ff79770cdc1 100644
--- a/metadata/md5-cache/dev-util/cmake-3.13.5
+++ b/metadata/md5-cache/dev-util/cmake-3.13.5
@@ -4,6 +4,7 @@ DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=de
 DESCRIPTION=Cross platform Make
 EAPI=7
 HOMEPAGE=https://cmake.org/
+INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic toolchain-funcs virtualx xdg-utils
 IUSE=doc emacs system-jsoncpp ncurses qt5 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
@@ -11,5 +12,5 @@ RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.13/cmake-3.13.5.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=0eb3eb2d6101aba7927f93abc1231c88
diff --git a/metadata/md5-cache/dev-util/cmake-3.18.5 b/metadata/md5-cache/dev-util/cmake-3.18.5
index 7c5847a0a3bb..6434d26f8851 100644
--- a/metadata/md5-cache/dev-util/cmake-3.18.5
+++ b/metadata/md5-cache/dev-util/cmake-3.18.5
@@ -4,6 +4,7 @@ DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=de
 DESCRIPTION=Cross platform Make
 EAPI=7
 HOMEPAGE=https://cmake.org/
+INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils
 IUSE=doc emacs ncurses qt5 test test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
@@ -11,5 +12,5 @@ RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.18/cmake-3.18.5.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=c2c6bb659e1ae9e780ff06e5cc633766
diff --git a/metadata/md5-cache/dev-util/cmake-3.19.6 b/metadata/md5-cache/dev-util/cmake-3.19.6
index d399d1ebed46..28ba54435174 100644
--- a/metadata/md5-cache/dev-util/cmake-3.19.6
+++ b/metadata/md5-cache/dev-util/cmake-3.19.6
@@ -4,6 +4,7 @@ DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=de
 DESCRIPTION=Cross platform Make
 EAPI=7
 HOMEPAGE=https://cmake.org/
+INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils
 IUSE=doc emacs ncurses qt5 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
@@ -11,5 +12,5 @@ RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.19/cmake-3.19.6.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=2b05dc93551f629b5e16ba64d73aac39
diff --git a/metadata/md5-cache/dev-util/cmake-3.19.7 b/metadata/md5-cache/dev-util/cmake-3.19.7
index aeaa4ddd9d14..0791bb143c14 100644
--- a/metadata/md5-cache/dev-util/cmake-3.19.7
+++ b/metadata/md5-cache/dev-util/cmake-3.19.7
@@ -4,6 +4,7 @@ DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=de
 DESCRIPTION=Cross platform Make
 EAPI=7
 HOMEPAGE=https://cmake.org/
+INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils
 IUSE=doc emacs ncurses qt5 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
@@ -11,5 +12,5 @@ RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.19/cmake-3.19.7.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=2b05dc93551f629b5e16ba64d73aac39
diff --git a/metadata/md5-cache/dev-util/cmake-3.20.0_rc5 b/metadata/md5-cache/dev-util/cmake-3.20.0_rc5
index e8df872af59d..1416f48afa69 100644
--- a/metadata/md5-cache/dev-util/cmake-3.20.0_rc5
+++ b/metadata/md5-cache/dev-util/cmake-3.20.0_rc5
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.20/cmake-3.20.0-rc5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	elisp-common	d4b53ec63c580b993ed19445f411e1d2	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=0159b51a0e032ef8c16bae7f2a3ec75a
diff --git a/metadata/md5-cache/dev-util/cscope-15.8a-r1 b/metadata/md5-cache/dev-util/cscope-15.8a-r1
index 01afcad931e6..e20422581452 100644
--- a/metadata/md5-cache/dev-util/cscope-15.8a-r1
+++ b/metadata/md5-cache/dev-util/cscope-15.8a-r1
@@ -10,5 +10,5 @@ LICENSE=BSD GPL-2+
 RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://sourceforge/cscope/cscope-15.8a.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=dc85cfd8d02f8b96f0994e48c8b2e75d
diff --git a/metadata/md5-cache/dev-util/cscope-15.8a-r2 b/metadata/md5-cache/dev-util/cscope-15.8a-r2
index 13b1bb8cc759..ea450a7c8a5c 100644
--- a/metadata/md5-cache/dev-util/cscope-15.8a-r2
+++ b/metadata/md5-cache/dev-util/cscope-15.8a-r2
@@ -10,5 +10,5 @@ LICENSE=BSD GPL-2+
 RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://sourceforge/cscope/cscope-15.8a.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=5166834f6a1bab4ce14a63c29fd78298
diff --git a/metadata/md5-cache/dev-util/cscope-15.9 b/metadata/md5-cache/dev-util/cscope-15.9
index d75522cc2cc3..fde741a66b26 100644
--- a/metadata/md5-cache/dev-util/cscope-15.9
+++ b/metadata/md5-cache/dev-util/cscope-15.9
@@ -11,5 +11,5 @@ LICENSE=BSD GPL-2+
 RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://sourceforge/cscope/cscope-15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=97071ce9b0a3b44199953786211e2214
diff --git a/metadata/md5-cache/dev-util/desktop-file-utils-0.24 b/metadata/md5-cache/dev-util/desktop-file-utils-0.24
index eb8260f16a8a..eab741fb691b 100644
--- a/metadata/md5-cache/dev-util/desktop-file-utils-0.24
+++ b/metadata/md5-cache/dev-util/desktop-file-utils-0.24
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.12:2 emacs? ( >=app-editors/emacs-23.1:* )
 DESCRIPTION=Command line utilities to work with desktop menu entries
 EAPI=7
 HOMEPAGE=https://freedesktop.org/wiki/Software/desktop-file-utils
+INHERIT=elisp-common
 IUSE=emacs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.12:2 emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.24.tar.xz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=6b7b650a019b3eb887cb6ca37ac6dc87
diff --git a/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1 b/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
index 9a9dcdf706c1..2ec12b8cb129 100644
--- a/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
+++ b/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.12:2
 DESCRIPTION=Command line utilities to work with desktop menu entries
 EAPI=7
 HOMEPAGE=https://freedesktop.org/wiki/Software/desktop-file-utils
+INHERIT=elisp-common meson
 IUSE=emacs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.12:2
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.26.tar.xz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	meson	e43eef9331f54965a573ed380854ff47
 _md5_=274d6f718516ad41cc6d58bc2fb321b4
diff --git a/metadata/md5-cache/dev-util/global-6.6.4 b/metadata/md5-cache/dev-util/global-6.6.4
index 4f330fb2e8cc..2370148058bd 100644
--- a/metadata/md5-cache/dev-util/global-6.6.4
+++ b/metadata/md5-cache/dev-util/global-6.6.4
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses emacs? ( >=app-editors/emacs-23.1:* ) vim? ( || ( app-editors/vim app-editors/gvim ) ) || ( dev-libs/libltdl:0 sys-devel/libtool:2 )
 SLOT=0
 SRC_URI=mirror://gnu/global/global-6.6.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=b581472ebcd9757bf6c8676ab32b4fab
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.32-r1 b/metadata/md5-cache/dev-util/gtk-doc-1.32-r1
index 477308c751d4..4e00b1d2e149 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.32-r1
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.32-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	libtool	f143db5a74ccd9ca28c1234deffede96	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	4d6de9e2337521f60965d1a9a118761f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	libtool	f143db5a74ccd9ca28c1234deffede96	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	4d6de9e2337521f60965d1a9a118761f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=cb03404383104f89212a9bcc39672f3f
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.32-r2 b/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
index c2957d610381..6b4cb7fb4158 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	libtool	f143db5a74ccd9ca28c1234deffede96	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	4d6de9e2337521f60965d1a9a118761f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	libtool	f143db5a74ccd9ca28c1234deffede96	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	4d6de9e2337521f60965d1a9a118761f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=5a40d4923999b96df87e71a41b7424ab
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r3 b/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r3
index 5edd4f7076ad..f829256e6e84 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r3
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.33/gtk-doc-1.33.1.tar.xz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	gnome.org	4d6de9e2337521f60965d1a9a118761f	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	meson	e43eef9331f54965a573ed380854ff47	python-single-r1	d3100de905f978df912135806cf27188	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	gnome.org	4d6de9e2337521f60965d1a9a118761f	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	meson	e43eef9331f54965a573ed380854ff47	python-single-r1	d3100de905f978df912135806cf27188	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=3b5a05ba10f56e0e108588d530e87d4b
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r4 b/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r4
index 077baa90f68e..721658c43414 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r4
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.33/gtk-doc-1.33.1.tar.xz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	gnome.org	4d6de9e2337521f60965d1a9a118761f	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	meson	e43eef9331f54965a573ed380854ff47	python-single-r1	d3100de905f978df912135806cf27188	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	gnome.org	4d6de9e2337521f60965d1a9a118761f	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	meson	e43eef9331f54965a573ed380854ff47	python-single-r1	d3100de905f978df912135806cf27188	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=b626a152dcc496128ba71abd32184374
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.0 b/metadata/md5-cache/dev-util/ninja-1.10.0
index 86e457d50632..657e06eb0129 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.0
+++ b/metadata/md5-cache/dev-util/ninja-1.10.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst postrm setup test
 DESCRIPTION=A small build system similar to make
 EAPI=7
 HOMEPAGE=https://ninja-build.org/
+INHERIT=bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 IUSE=doc emacs test vim-syntax
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz -> ninja-1.10.0.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=035412071b48fc36ef07c54f033790f2
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.1 b/metadata/md5-cache/dev-util/ninja-1.10.1
index 409943bb64e3..ddcdd24a5704 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.1
+++ b/metadata/md5-cache/dev-util/ninja-1.10.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst postrm setup test
 DESCRIPTION=A small build system similar to make
 EAPI=7
 HOMEPAGE=https://ninja-build.org/
+INHERIT=bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 IUSE=doc emacs test vim-syntax
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.1.tar.gz -> ninja-1.10.1.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=beb8b42457313542feda750782545af3
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.2 b/metadata/md5-cache/dev-util/ninja-1.10.2
index 005079c920c0..72305bc563b3 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.2
+++ b/metadata/md5-cache/dev-util/ninja-1.10.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst postrm setup test
 DESCRIPTION=A small build system similar to make
 EAPI=7
 HOMEPAGE=https://ninja-build.org/
+INHERIT=bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 IUSE=doc emacs test vim-syntax
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.2.tar.gz -> ninja-1.10.2.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=d1fde879fb4317751a0633e81151ef05
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.2-r1 b/metadata/md5-cache/dev-util/ninja-1.10.2-r1
index cde0cc750353..1c3450f0c9b3 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.2-r1
+++ b/metadata/md5-cache/dev-util/ninja-1.10.2-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst postrm setup test
 DESCRIPTION=A small build system similar to make
 EAPI=7
 HOMEPAGE=https://ninja-build.org/
+INHERIT=bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 IUSE=doc emacs test vim-syntax
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.2.tar.gz -> ninja-1.10.2.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=3718dd89b95c34334e2addf9eac9d69a
diff --git a/metadata/md5-cache/dev-util/ninja-9999 b/metadata/md5-cache/dev-util/ninja-9999
index 6bf58b80e0fb..b63fb006e9d0 100644
--- a/metadata/md5-cache/dev-util/ninja-9999
+++ b/metadata/md5-cache/dev-util/ninja-9999
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile install postinst postrm setup test unpack
 DESCRIPTION=A small build system similar to make
 EAPI=7
 HOMEPAGE=https://ninja-build.org/
+INHERIT=bash-completion-r1 elisp-common python-any-r1 toolchain-funcs git-r3
 IUSE=doc emacs test vim-syntax
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=57691513ead437168f53a83c1bfc9913
diff --git a/metadata/md5-cache/dev-vcs/git-2.26.2 b/metadata/md5-cache/dev-vcs/git-2.26.2
index 664dca212cdd..61dc216de87c 100644
--- a/metadata/md5-cache/dev-vcs/git-2.26.2
+++ b/metadata/md5-cache/dev-vcs/git-2.26.2
@@ -4,6 +4,7 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 HOMEPAGE=https://www.git-scm.com/
+INHERIT=toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.26.2.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.26.2.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.26.2.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=acf4447dc88f9ccd0011412216336506
diff --git a/metadata/md5-cache/dev-vcs/git-2.26.3 b/metadata/md5-cache/dev-vcs/git-2.26.3
index 2050053e4e8b..edf22aac8f46 100644
--- a/metadata/md5-cache/dev-vcs/git-2.26.3
+++ b/metadata/md5-cache/dev-vcs/git-2.26.3
@@ -13,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.26.3.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.26.3.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.26.3.tar.xz )
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=2f7efa17da0ad003c692ce15e9b6a139
diff --git a/metadata/md5-cache/dev-vcs/git-2.28.1 b/metadata/md5-cache/dev-vcs/git-2.28.1
index f2a94fd68dc7..3b35d0ac5e55 100644
--- a/metadata/md5-cache/dev-vcs/git-2.28.1
+++ b/metadata/md5-cache/dev-vcs/git-2.28.1
@@ -4,6 +4,7 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 HOMEPAGE=https://www.git-scm.com/
+INHERIT=toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.28.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.28.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.28.1.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=2eb35883e5e726f90b971f00998b314c
diff --git a/metadata/md5-cache/dev-vcs/git-2.29.3 b/metadata/md5-cache/dev-vcs/git-2.29.3
index 8dda28747bc6..2d46b1b11e61 100644
--- a/metadata/md5-cache/dev-vcs/git-2.29.3
+++ b/metadata/md5-cache/dev-vcs/git-2.29.3
@@ -4,6 +4,7 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 HOMEPAGE=https://www.git-scm.com/
+INHERIT=toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.29.3.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.29.3.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.29.3.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=85d5d9f598e4022ca024d310dabaae29
diff --git a/metadata/md5-cache/dev-vcs/git-2.30.2 b/metadata/md5-cache/dev-vcs/git-2.30.2
index bcbaaf311cc2..ce32d6a39b6c 100644
--- a/metadata/md5-cache/dev-vcs/git-2.30.2
+++ b/metadata/md5-cache/dev-vcs/git-2.30.2
@@ -4,6 +4,7 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 HOMEPAGE=https://www.git-scm.com/
+INHERIT=toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.30.2.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.30.2.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.30.2.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=7dc9fcc1e8e90c29fe09619ed1056a75
diff --git a/metadata/md5-cache/dev-vcs/git-2.31.0-r1 b/metadata/md5-cache/dev-vcs/git-2.31.0-r1
index 467bc6a62410..24c53e6cda2b 100644
--- a/metadata/md5-cache/dev-vcs/git-2.31.0-r1
+++ b/metadata/md5-cache/dev-vcs/git-2.31.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.31.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.31.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.31.0.tar.xz )
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=035dcac08069524b033cde97ae172b26
diff --git a/metadata/md5-cache/dev-vcs/git-9999 b/metadata/md5-cache/dev-vcs/git-9999
index fca1463ce822..09758d03cc2e 100644
--- a/metadata/md5-cache/dev-vcs/git-9999
+++ b/metadata/md5-cache/dev-vcs/git-9999
@@ -12,5 +12,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741	git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=0a7fa059aa64888f94f3e0b9b0b8cc28
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r1 b/metadata/md5-cache/dev-vcs/git-9999-r1
index 2ee881a60a59..0dfb78322759 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r1
+++ b/metadata/md5-cache/dev-vcs/git-9999-r1
@@ -12,5 +12,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741	git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=1a7fe1b5d853743840099eb5f1da8031
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r2 b/metadata/md5-cache/dev-vcs/git-9999-r2
index 2ee881a60a59..0dfb78322759 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r2
+++ b/metadata/md5-cache/dev-vcs/git-9999-r2
@@ -12,5 +12,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741	git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=1a7fe1b5d853743840099eb5f1da8031
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r3 b/metadata/md5-cache/dev-vcs/git-9999-r3
index 6b8caecb55cc..f1ccc575a710 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r3
+++ b/metadata/md5-cache/dev-vcs/git-9999-r3
@@ -12,5 +12,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	d4b53ec63c580b993ed19445f411e1d2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741	git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	bash-completion-r1	be99724bde4274de21e581204e9d164a	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=412e82774ea1ba11d18480889a35d601
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.5.2 b/metadata/md5-cache/dev-vcs/mercurial-5.5.2
index e3a9940b8c7d..9a24eb787efe 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.5.2
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.5.2
@@ -4,6 +4,7 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( app-arch/unzip dev-python/p
 DESCRIPTION=Scalable distributed SCM
 EAPI=7
 HOMEPAGE=https://www.mercurial-scm.org/
+INHERIT=bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
 IUSE=+chg emacs gpg test tk zsh-completion python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.5.2.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=d7db7da79e50fc479282e8e6004ce5ba
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.6.1-r1 b/metadata/md5-cache/dev-vcs/mercurial-5.6.1-r1
index 36a646f88eef..5e50bd438fd4 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.6.1-r1
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.6.1-r1
@@ -4,6 +4,7 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( app-arch/unzip dev-python/p
 DESCRIPTION=Scalable distributed SCM
 EAPI=7
 HOMEPAGE=https://www.mercurial-scm.org/
+INHERIT=bash-completion-r1 cargo elisp-common eutils distutils-r1 flag-o-matic
 IUSE=+chg emacs gpg test tk rust zsh-completion debug python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT PSF-2 Unlicense )
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.6.1.tar.gz rust? ( https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.60/download -> cc-1.0.60.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cpython/0.4.1/download -> cpython-0.4.1.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam/0.7.3/download -> crossbeam-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.4/download -> crossbeam-channel-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.3/download -> crossbeam-queue-0.2.3.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/ctor/0.1.16/download -> ctor-0.1.16.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/flate2/1.0.17/download -> flate2-1.0.17.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.16/download -> hermit-abi-0.1.16.crate https://crates.io/api/v1/crates/hex/0.4.2/download -> hex-0.4.2.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.77/download -> libc-0.2.77.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.5.6/download -> memoffset-0.5.6.crate https://crates.io/api/v1/crates/micro-timer/0.3.1/download -> micro-timer-0.3.1.crate https://crates.io/api/v1/crates/micro-timer-macros/0.3.1/download -> micro-timer-macros-0.3.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.2/download -> miniz_oxide-0.4.2.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.18/download -> pkg-config-0.3.18.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.9/download -> ppv-lite86-0.2.9.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.21/download -> proc-macro2-1.0.21.crate https://crates.io/api/v1/crates/python27-sys/0.4.1/download -> python27-sys-0.4.1.crate https://crates.io/api/v1/crates/python3-sys/0.4.1/download -> python3-sys-0.4.1.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_distr/0.2.2/download -> rand_distr-0.2.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rayon/1.4.0/download -> rayon-1.4.0.crate https://crates.io/api/v1/crates/rayon-core/1.8.1/download -> rayon-core-1.8.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.41/download -> syn-1.0.41.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/twox-hash/1.5.0/download -> twox-hash-1.5.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.10/download -> vcpkg-0.2.10.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/zstd/0.5.3+zstd.1.4.5/download -> zstd-0.5.3+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-safe/2.0.5+zstd.1.4.5/download -> zstd-safe-2.0.5+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-sys/1.4.17+zstd.1.4.5/download -> zstd-sys-1.4.17+zstd.1.4.5.crate )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cargo	ee3fdb62142c867f137d4fab6f1ad34d	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	multiprocessing	cac3169468f893670dac3e7cb940e045	cargo	ee3fdb62142c867f137d4fab6f1ad34d	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=b1db2b3285bf53ec7286705cad5c678c
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.7 b/metadata/md5-cache/dev-vcs/mercurial-5.7
index 8d0f98ca2f86..5c4084298d7e 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.7
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.7
@@ -4,6 +4,7 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( app-arch/unzip dev-python/p
 DESCRIPTION=Scalable distributed SCM
 EAPI=7
 HOMEPAGE=https://www.mercurial-scm.org/
+INHERIT=bash-completion-r1 cargo elisp-common eutils distutils-r1 flag-o-matic
 IUSE=+chg emacs gpg test tk rust zsh-completion debug python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT PSF-2 Unlicense )
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.7.tar.gz rust? ( https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitmaps/2.1.0/download -> bitmaps-2.1.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/const_fn/0.4.4/download -> const_fn-0.4.4.crate https://crates.io/api/v1/crates/cpython/0.4.1/download -> cpython-0.4.1.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.4/download -> crossbeam-channel-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.1/download -> crossbeam-epoch-0.9.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/ctor/0.1.16/download -> ctor-0.1.16.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/format-bytes/0.1.3/download -> format-bytes-0.1.3.crate https://crates.io/api/v1/crates/format-bytes-macros/0.1.2/download -> format-bytes-macros-0.1.2.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/hex/0.4.2/download -> hex-0.4.2.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/im-rc/15.0.0/download -> im-rc-15.0.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.81/download -> libc-0.2.81.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.6.1/download -> memoffset-0.6.1.crate https://crates.io/api/v1/crates/micro-timer/0.3.1/download -> micro-timer-0.3.1.crate https://crates.io/api/v1/crates/micro-timer-macros/0.3.1/download -> micro-timer-macros-0.3.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/python27-sys/0.4.1/download -> python27-sys-0.4.1.crate https://crates.io/api/v1/crates/python3-sys/0.4.1/download -> python3-sys-0.4.1.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_distr/0.2.2/download -> rand_distr-0.2.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rand_xoshiro/0.4.0/download -> rand_xoshiro-0.4.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sized-chunks/0.6.2/download -> sized-chunks-0.6.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.54/download -> syn-1.0.54.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/twox-hash/1.6.0/download -> twox-hash-1.6.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/zstd/0.5.3+zstd.1.4.5/download -> zstd-0.5.3+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-safe/2.0.5+zstd.1.4.5/download -> zstd-safe-2.0.5+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-sys/1.4.17+zstd.1.4.5/download -> zstd-sys-1.4.17+zstd.1.4.5.crate )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cargo	ee3fdb62142c867f137d4fab6f1ad34d	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	multiprocessing	cac3169468f893670dac3e7cb940e045	cargo	ee3fdb62142c867f137d4fab6f1ad34d	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=f51ea596b6d1517f96e08f3d3ef7314f
diff --git a/metadata/md5-cache/dev-vcs/mercurial-9999 b/metadata/md5-cache/dev-vcs/mercurial-9999
index 0394bf74960f..314ca397d985 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-9999
@@ -4,6 +4,7 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( app-arch/unzip dev-python/p
 DESCRIPTION=Scalable distributed SCM
 EAPI=7
 HOMEPAGE=https://www.mercurial-scm.org/
+INHERIT=bash-completion-r1 cargo elisp-common eutils distutils-r1 mercurial flag-o-matic
 IUSE=+chg emacs gpg test tk rust zsh-completion debug python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=GPL-2+
 PROPERTIES=live
@@ -11,5 +12,5 @@ RDEPEND=app-misc/ca-certificates dev-python/zstandard[python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cargo	ee3fdb62142c867f137d4fab6f1ad34d	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mercurial	d22fe98ea362174612a57c233239102f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	multiprocessing	cac3169468f893670dac3e7cb940e045	cargo	ee3fdb62142c867f137d4fab6f1ad34d	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f	mercurial	d22fe98ea362174612a57c233239102f	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=955cbf342a5df45a7e01128e490aed01
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.68 b/metadata/md5-cache/media-gfx/asymptote-2.68
index 21d37d68f388..49207117a1e0 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.68
+++ b/metadata/md5-cache/media-gfx/asymptote-2.68
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) offscreen?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.68.src.tgz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	latex-package	e5f296c98696dd02059bc6a5a03282e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	latex-package	e5f296c98696dd02059bc6a5a03282e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95
 _md5_=b7b8323ef40bb3498baf0a4688e0c44e
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.69-r1 b/metadata/md5-cache/media-gfx/asymptote-2.69-r1
index 7dc6e1826756..3c6a5e32a8ce 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.69-r1
+++ b/metadata/md5-cache/media-gfx/asymptote-2.69-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.69.src.tgz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	latex-package	e5f296c98696dd02059bc6a5a03282e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	latex-package	e5f296c98696dd02059bc6a5a03282e2	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95
 _md5_=41f8ee90945b6e872840c7a8dac7e09d
diff --git a/metadata/md5-cache/media-gfx/openscad-2019.05-r5 b/metadata/md5-cache/media-gfx/openscad-2019.05-r5
index a8d79a184593..5e3d60ea2ad0 100644
--- a/metadata/md5-cache/media-gfx/openscad-2019.05-r5
+++ b/metadata/md5-cache/media-gfx/openscad-2019.05-r5
@@ -4,6 +4,7 @@ DEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/gl
 DESCRIPTION=The Programmers Solid 3D CAD Modeller
 EAPI=7
 HOMEPAGE=https://www.openscad.org/
+INHERIT=elisp-common qmake-utils xdg
 IUSE=ccache emacs
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/g
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openscad/openscad/releases/download/openscad-2019.05/openscad-2019.05.src.tar.gz -> openscad-2019.05.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
 _md5_=876b9c8a09d1e11258a60d82e75f43f3
diff --git a/metadata/md5-cache/media-gfx/openscad-2021.01 b/metadata/md5-cache/media-gfx/openscad-2021.01
index 759256afcffd..231d92c813a9 100644
--- a/metadata/md5-cache/media-gfx/openscad-2021.01
+++ b/metadata/md5-cache/media-gfx/openscad-2021.01
@@ -4,6 +4,7 @@ DEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/gl
 DESCRIPTION=The Programmers Solid 3D CAD Modeller
 EAPI=7
 HOMEPAGE=https://www.openscad.org/
+INHERIT=elisp-common qmake-utils xdg
 IUSE=emacs
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/g
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openscad/openscad/releases/download/openscad-2021.01/openscad-2021.01.src.tar.gz -> openscad-2021.01.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
 _md5_=d58d353e85313fff774711e7404fae83
diff --git a/metadata/md5-cache/media-gfx/openscad-9999 b/metadata/md5-cache/media-gfx/openscad-9999
index ed244ae0777a..89b0edb353d0 100644
--- a/metadata/md5-cache/media-gfx/openscad-9999
+++ b/metadata/md5-cache/media-gfx/openscad-9999
@@ -4,6 +4,7 @@ DEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/gl
 DESCRIPTION=The Programmers Solid 3D CAD Modeller
 EAPI=7
 HOMEPAGE=https://www.openscad.org/
+INHERIT=cmake elisp-common git-r3 xdg
 IUSE=cairo dbus emacs gamepad headless spacenav
 LICENSE=GPL-3+ LGPL-2.1
 PROPERTIES=live
@@ -11,5 +12,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/g
 REQUIRED_USE=headless? ( !dbus !gamepad !spacenav )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	git-r3	3e7ec3d6619213460c85e2aa48398441	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
 _md5_=8d34b9b440f31569c138ca51ee22076f
diff --git a/metadata/md5-cache/media-sound/lilypond-2.22.0 b/metadata/md5-cache/media-sound/lilypond-2.22.0
index 56b0eb2447ae..5bca517e5434 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.22.0
+++ b/metadata/md5-cache/media-sound/lilypond-2.22.0
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=0
 SRC_URI=http://lilypond.org/download/sources/v2.22/lilypond-2.22.0.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c290343859bf65cf4baf08288e21eb11
diff --git a/metadata/md5-cache/media-sound/lilypond-2.23.0 b/metadata/md5-cache/media-sound/lilypond-2.23.0
index 7580ba446f7c..a8102a472e09 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.23.0
+++ b/metadata/md5-cache/media-sound/lilypond-2.23.0
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=0
 SRC_URI=http://lilypond.org/download/sources/v2.23/lilypond-2.23.0.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7020e87b32f95285de04794c8ee017a2
diff --git a/metadata/md5-cache/media-sound/lilypond-9999 b/metadata/md5-cache/media-sound/lilypond-9999
index 5d1331821a93..a490b1457d77 100644
--- a/metadata/md5-cache/media-sound/lilypond-9999
+++ b/metadata/md5-cache/media-sound/lilypond-9999
@@ -12,5 +12,5 @@ RDEPEND=app-text/ghostscript-gpl dev-scheme/guile:12=[deprecated,regex] media-fo
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=c8cc59a61c9bbc01e93f09c7aa78b2a6
diff --git a/metadata/md5-cache/media-sound/timidity++-2.15.0 b/metadata/md5-cache/media-sound/timidity++-2.15.0
index afc8f5ed4b6a..3283e1892502 100644
--- a/metadata/md5-cache/media-sound/timidity++-2.15.0
+++ b/metadata/md5-cache/media-sound/timidity++-2.15.0
@@ -13,5 +13,5 @@ RDEPEND=alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.5 ) emacs? (
 REQUIRED_USE=tk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	elisp-common	d4b53ec63c580b993ed19445f411e1d2	systemd	74b223e42834adf09a2d21fe5fe13741	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	systemd	74b223e42834adf09a2d21fe5fe13741	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
 _md5_=7e55d9648fab3bd63c8bc8363e9a1758
diff --git a/metadata/md5-cache/net-dns/libidn-1.36 b/metadata/md5-cache/net-dns/libidn-1.36
index 0735c16f7ca4..33281ebd67e9 100644
--- a/metadata/md5-cache/net-dns/libidn-1.36
+++ b/metadata/md5-cache/net-dns/libidn-1.36
@@ -11,5 +11,5 @@ LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/12
 SRC_URI=mirror://gnu/libidn/libidn-1.36.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
 _md5_=ad91204e45229301bc76e10c91b715b1
diff --git a/metadata/md5-cache/net-mail/mailutils-3.11.1 b/metadata/md5-cache/net-mail/mailutils-3.11.1
index 16925f71b220..e4a61b423bd4 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.11.1
+++ b/metadata/md5-cache/net-mail/mailutils-3.11.1
@@ -12,5 +12,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.11.1.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
 _md5_=ecc0bf15aa9efb1ddae0b6ab8ac40e0c
diff --git a/metadata/md5-cache/net-mail/mailutils-3.12 b/metadata/md5-cache/net-mail/mailutils-3.12
index 79d6f40a6a03..d27ebf3a84a7 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.12
+++ b/metadata/md5-cache/net-mail/mailutils-3.12
@@ -12,5 +12,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.12.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
 _md5_=374517ab654a73dba8d4cbe03be28f8d
diff --git a/metadata/md5-cache/net-mail/mailutils-3.8 b/metadata/md5-cache/net-mail/mailutils-3.8
index e2729cce0afd..585056cd66d2 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.8
+++ b/metadata/md5-cache/net-mail/mailutils-3.8
@@ -12,5 +12,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.8.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
 _md5_=d7947127418aab9860f0f57b05a840f5
diff --git a/metadata/md5-cache/net-mail/mailutils-3.9 b/metadata/md5-cache/net-mail/mailutils-3.9
index 140cba0c05de..c1b650f4b3df 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.9
+++ b/metadata/md5-cache/net-mail/mailutils-3.9
@@ -12,5 +12,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.9.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
 _md5_=e4d9f3fd0d839654af1dd36fdce901ca
diff --git a/metadata/md5-cache/net-mail/mu-1.4.15 b/metadata/md5-cache/net-mail/mu-1.4.15
index 99dca75f1689..848016b5264a 100644
--- a/metadata/md5-cache/net-mail/mu-1.4.15
+++ b/metadata/md5-cache/net-mail/mu-1.4.15
@@ -11,5 +11,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
 SLOT=0
 SRC_URI=https://github.com/djcb/mu/archive/1.4.15.tar.gz -> mu-1.4.15.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=da46169ba52b6b19ba49bd72e5a3e82c
diff --git a/metadata/md5-cache/net-mail/mu-1.4.15-r1 b/metadata/md5-cache/net-mail/mu-1.4.15-r1
index b18f118cc736..4ff06503c222 100644
--- a/metadata/md5-cache/net-mail/mu-1.4.15-r1
+++ b/metadata/md5-cache/net-mail/mu-1.4.15-r1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= emacs? ( >=a
 DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
 EAPI=7
 HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
+INHERIT=elisp-common
 IUSE=emacs guile mug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
 SLOT=0
 SRC_URI=https://github.com/djcb/mu/releases/download/1.4.15/mu-1.4.15.tar.xz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=f63172b9ebf03ba8943a28eab16d38fc
diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.3-r2 b/metadata/md5-cache/net-mail/notmuch-0.29.3-r2
index 7566acf42599..1feb2267d61f 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.29.3-r2
+++ b/metadata/md5-cache/net-mail/notmuch-0.29.3-r2
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.8:= sys-lib
 DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
 EAPI=7
 HOMEPAGE=https://notmuchmail.org/
+INHERIT=bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic pax-utils readme.gentoo-r1 toolchain-funcs
 IUSE=crypt doc emacs mutt nmbug python test valgrind python_targets_python3_7
 KEYWORDS=~alpha amd64 ~ppc64 x86
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python3_7 ) ) test?
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.29.3.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=43a4bca5d5c2f07503d0e9adaaceabe4
diff --git a/metadata/md5-cache/net-mail/notmuch-0.30-r1 b/metadata/md5-cache/net-mail/notmuch-0.30-r1
index 8d5e86974f2e..4aa2f7caa1bf 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.30-r1
+++ b/metadata/md5-cache/net-mail/notmuch-0.30-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.14:= sys-li
 DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
 EAPI=7
 HOMEPAGE=https://notmuchmail.org/
+INHERIT=bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs
 IUSE=crypt doc emacs mutt nmbug python test valgrind python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python3_7 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.30.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pax-utils	a41d1fd1c111289ffa04490de6ee79d7
 _md5_=312af23f558d1c3712401716186842f4
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31 b/metadata/md5-cache/net-mail/notmuch-0.31
index 448af81db7b8..95ae509b7beb 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.31
+++ b/metadata/md5-cache/net-mail/notmuch-0.31
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] dev-libs/xapian:= sys-libs/talloc
 DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
 EAPI=7
 HOMEPAGE=https://notmuchmail.org/
+INHERIT=bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs
 IUSE=crypt doc emacs mutt nmbug python test valgrind python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python3_7 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pax-utils	a41d1fd1c111289ffa04490de6ee79d7
 _md5_=b5612aec389ae74ae98fd76e3bafc79a
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31-r2 b/metadata/md5-cache/net-mail/notmuch-0.31-r2
index 9a47d5f95142..d69b23595258 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.31-r2
+++ b/metadata/md5-cache/net-mail/notmuch-0.31-r2
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-lib
 DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
 EAPI=7
 HOMEPAGE=https://notmuchmail.org/
+INHERIT=bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
 IUSE=apidoc crypt doc emacs mutt nmbug python test valgrind python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pyp
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=62e361c9e59af752071366c5a87e19b7
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31.2 b/metadata/md5-cache/net-mail/notmuch-0.31.2
index 6b6913b9eba7..a8b292fb0ed9 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.31.2
+++ b/metadata/md5-cache/net-mail/notmuch-0.31.2
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-lib
 DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
 EAPI=7
 HOMEPAGE=https://notmuchmail.org/
+INHERIT=bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
 IUSE=apidoc crypt doc emacs mutt nmbug python test valgrind python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pyp
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.2.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c6bc595150b00d828e485730753ba58
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31.3 b/metadata/md5-cache/net-mail/notmuch-0.31.3
index 0a466e04996b..be1968f5e5c5 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.31.3
+++ b/metadata/md5-cache/net-mail/notmuch-0.31.3
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-lib
 DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
 EAPI=7
 HOMEPAGE=https://notmuchmail.org/
+INHERIT=bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
 IUSE=apidoc crypt doc emacs mutt nmbug python test valgrind python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pyp
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.3.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	distutils-r1	16579e06f8839831bd5c03455bb87e3f	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=962e86565cf4815b8901ca787f2bce55
diff --git a/metadata/md5-cache/net-wireless/srslte-20.10.1-r1 b/metadata/md5-cache/net-wireless/srslte-20.10.1-r1
deleted file mode 100644
index afb945930efb..000000000000
--- a/metadata/md5-cache/net-wireless/srslte-20.10.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-libs/libconfig:= net-misc/lksctp-tools net-libs/mbedtls:= sci-libs/fftw:3.0= bladerf? ( net-wireless/bladerf:= ) simcard? ( sys-apps/pcsc-lite ) soapysdr? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:= ) zeromq? ( net-libs/zeromq:= )
-DESCRIPTION=Open source SDR LTE software suite from Software Radio Systems
-EAPI=7
-HOMEPAGE=http://www.softwareradiosystems.com
-IUSE=bladerf simcard soapysdr uhd zeromq
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/boost:= dev-libs/libconfig:= net-misc/lksctp-tools net-libs/mbedtls:= sci-libs/fftw:3.0= bladerf? ( net-wireless/bladerf:= ) simcard? ( sys-apps/pcsc-lite ) soapysdr? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:= ) zeromq? ( net-libs/zeromq:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/srsLTE/srsLTE/archive/release_20_10_1.tar.gz -> srslte-20.10.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=77c36ab30862a42ff5909d536a09a382
diff --git a/metadata/md5-cache/net-wireless/srslte-20.10.1-r2 b/metadata/md5-cache/net-wireless/srslte-20.10.1-r2
new file mode 100644
index 000000000000..2ee165a545a1
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/srslte-20.10.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/boost:= dev-libs/libconfig:=[cxx] net-misc/lksctp-tools net-libs/mbedtls:= sci-libs/fftw:3.0= bladerf? ( net-wireless/bladerf:= ) simcard? ( sys-apps/pcsc-lite ) soapysdr? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:= ) zeromq? ( net-libs/zeromq:= )
+DESCRIPTION=Open source SDR LTE software suite from Software Radio Systems
+EAPI=7
+HOMEPAGE=http://www.softwareradiosystems.com
+INHERIT=cmake vcs-snapshot
+IUSE=bladerf simcard soapysdr uhd zeromq
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/boost:= dev-libs/libconfig:=[cxx] net-misc/lksctp-tools net-libs/mbedtls:= sci-libs/fftw:3.0= bladerf? ( net-wireless/bladerf:= ) simcard? ( sys-apps/pcsc-lite ) soapysdr? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:= ) zeromq? ( net-libs/zeromq:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/srsLTE/srsLTE/archive/release_20_10_1.tar.gz -> srslte-20.10.1.tar.gz
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=2a7fdb9df6cf3baa02c3d0019d661440
diff --git a/metadata/md5-cache/net-wireless/srslte-9999 b/metadata/md5-cache/net-wireless/srslte-9999
index ec6a977cfba1..f3574c8edf7f 100644
--- a/metadata/md5-cache/net-wireless/srslte-9999
+++ b/metadata/md5-cache/net-wireless/srslte-9999
@@ -1,14 +1,15 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-libs/libconfig:= net-misc/lksctp-tools net-libs/mbedtls:= sci-libs/fftw:3.0= bladerf? ( net-wireless/bladerf:= ) simcard? ( sys-apps/pcsc-lite ) soapysdr? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:= ) zeromq? ( net-libs/zeromq:= )
+DEPEND=dev-libs/boost:= dev-libs/libconfig:=[cxx] net-misc/lksctp-tools net-libs/mbedtls:= sci-libs/fftw:3.0= bladerf? ( net-wireless/bladerf:= ) simcard? ( sys-apps/pcsc-lite ) soapysdr? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:= ) zeromq? ( net-libs/zeromq:= )
 DESCRIPTION=Open source SDR LTE software suite from Software Radio Systems
 EAPI=7
 HOMEPAGE=http://www.softwareradiosystems.com
+INHERIT=cmake git-r3
 IUSE=bladerf simcard soapysdr uhd zeromq
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-libs/libconfig:= net-misc/lksctp-tools net-libs/mbedtls:= sci-libs/fftw:3.0= bladerf? ( net-wireless/bladerf:= ) simcard? ( sys-apps/pcsc-lite ) soapysdr? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:= ) zeromq? ( net-libs/zeromq:= )
+RDEPEND=dev-libs/boost:= dev-libs/libconfig:=[cxx] net-misc/lksctp-tools net-libs/mbedtls:= sci-libs/fftw:3.0= bladerf? ( net-wireless/bladerf:= ) simcard? ( sys-apps/pcsc-lite ) soapysdr? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:= ) zeromq? ( net-libs/zeromq:= )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=77c36ab30862a42ff5909d536a09a382
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	git-r3	3e7ec3d6619213460c85e2aa48398441
+_md5_=2a7fdb9df6cf3baa02c3d0019d661440
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.6.1.2 b/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
index 34bf088639b9..86ec249b641d 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
+++ b/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
@@ -11,5 +11,5 @@ PDEPEND=stdlib? ( ~sci-mathematics/agda-stdlib-2.6.1.2.1.4 )
 RDEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/blaze-html-0.8:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?] >=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?] >=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?] >=dev-haskell/equivalence-0.3.2:=[profile?] <dev-haskell/equivalence-0.4:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] <dev-haskell/gitrev-2.0:=[profile?] >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/hashtables-1.2.0.2:=[profile?] <dev-haskell/hashtables-1.3:=[profile?] >=dev-haskell/haskeline-0.7.2.3:=[profile?] <dev-haskell/haskeline-0.9:=[profile?] >=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.9:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?] >=dev-haskell/regex-tdfa-1.3.1.0:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?] >=dev-haskell/split-0.2.0.0:=[profile?] <dev-haskell/split-0.2.4:=[profile?] >=dev-haskell/stm-2.4.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.5:=[profile?] >=dev-haskell/text-1.2.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uri-encode-1.5.0.4:=[profile?] <dev-haskell/uri-encode-1.6:=[profile?] >=dev-haskell/zlib-0.6:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.2:= enable-cluster-counting? ( >=dev-haskell/text-icu-0.7:=[profile?] <dev-haskell/text-icu-0.8:=[profile?] ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/haskell-mode )
 SLOT=0/2.6.1.2
 SRC_URI=https://hackage.haskell.org/package/Agda-2.6.1.2/Agda-2.6.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=1f3460c80b1eeef5a25db800e151e56d
diff --git a/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4 b/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
index 1a4f6002acb9..831ae5e5cb82 100644
--- a/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
+++ b/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
@@ -3,11 +3,12 @@ DEPEND=>=sci-mathematics/agda-2.6.1.2:=[profile?] >=dev-haskell/cabal-1.24.2.0 >
 DESCRIPTION=Agda standard library
 EAPI=7
 HOMEPAGE=https://wiki.portal.chalmers.se/agda/
+INHERIT=haskell-cabal elisp-common
 IUSE=profile
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=sci-mathematics/agda-2.6.1.2:=[profile?]
 SLOT=0
 SRC_URI=https://github.com/agda/agda-stdlib/archive/v1.4.tar.gz -> agda-stdlib-2.6.1.2.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=592624cf25722d12d36034a11cf539f8
diff --git a/metadata/md5-cache/sci-mathematics/fricas-1.3.6 b/metadata/md5-cache/sci-mathematics/fricas-1.3.6
index 445e76880e42..7f7361d997b6 100644
--- a/metadata/md5-cache/sci-mathematics/fricas-1.3.6
+++ b/metadata/md5-cache/sci-mathematics/fricas-1.3.6
@@ -3,6 +3,7 @@ DEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( >=app-editors/emacs-23.1:
 DESCRIPTION=FriCAS is a fork of Axiom computer algebra system
 EAPI=7
 HOMEPAGE=http://fricas.sourceforge.net/
+INHERIT=multilib elisp-common
 IUSE=sbcl cmucl gcl ecls clisp clozurecl X emacs gmp
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
@@ -10,5 +11,5 @@ RDEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( >=app-editors/emacs-23.1
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/fricas/fricas-1.3.6-full.tar.bz2
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=e6cab1953113fb8f580268ea62aa9803
diff --git a/metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1 b/metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1
index 42331b968e8f..723479b2b7b6 100644
--- a/metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1
+++ b/metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1
@@ -3,11 +3,12 @@ DEPEND=virtual/glu virtual/opengl x11-libs/motif:0 emacs? ( >=app-editors/emacs-
 DESCRIPTION=Interactive Geometry Viewer
 EAPI=7
 HOMEPAGE=http://geomview.sourceforge.net
+INHERIT=desktop elisp-common flag-o-matic xdg
 IUSE=motionaveraging debug emacs zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/glu virtual/opengl x11-libs/motif:0 emacs? ( >=app-editors/emacs-23.1:* ) zlib? ( sys-libs/zlib ) x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/geomview/geomview-1.9.5.tar.bz2 https://dev.gentoo.org/~jlec/distfiles/geomview.png.tar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
 _md5_=1832af9bce2969c9d5ec5ff33060e9d3
diff --git a/metadata/md5-cache/sci-mathematics/gretl-1.9.90 b/metadata/md5-cache/sci-mathematics/gretl-1.9.90
index f19c04839446..de215eaa18f3 100644
--- a/metadata/md5-cache/sci-mathematics/gretl-1.9.90
+++ b/metadata/md5-cache/sci-mathematics/gretl-1.9.90
@@ -3,6 +3,7 @@ DEPEND=dev-libs/glib:2= dev-libs/gmp:0= dev-libs/libxml2:2= dev-libs/mpfr:0= sci
 DESCRIPTION=Regression, econometrics and time-series library
 EAPI=5
 HOMEPAGE=http://gretl.sourceforge.net/
+INHERIT=eutils elisp-common toolchain-funcs
 IUSE=accessibility cpu_flags_x86_avx +curl emacs gnome gtk mpi nls odbc openmp python readline cpu_flags_x86_sse2 R static-libs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/glib:2= dev-libs/gmp:0= dev-libs/libxml2:2= dev-libs/mpfr:0= sc
 REQUIRED_USE=emacs? ( gtk ) !curl? ( !gtk )
 SLOT=0/10
 SRC_URI=mirror://sourceforge/gretl/gretl-1.9.90.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=fc7b59646d3b24bfc4a987c268a9a9f9
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.42.1 b/metadata/md5-cache/sci-mathematics/maxima-5.42.1
index 973e13655b66..9f76de88c518 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.42.1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.42.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( >=app-editors/emacs-23.1:* virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.42.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b1728a482df789b983aa05a10dea46b
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.44.0 b/metadata/md5-cache/sci-mathematics/maxima-5.44.0
index 7f11dc11963f..2d735f12b867 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.44.0
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.44.0
@@ -11,5 +11,5 @@ RDEPEND=X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.44.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=19f7469854c90b660eeb1118c6e069fa
diff --git a/metadata/md5-cache/sci-mathematics/pspp-1.2.0-r1 b/metadata/md5-cache/sci-mathematics/pspp-1.2.0-r1
index aeaf75c8e496..f277b328c32e 100644
--- a/metadata/md5-cache/sci-mathematics/pspp-1.2.0-r1
+++ b/metadata/md5-cache/sci-mathematics/pspp-1.2.0-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libxml2:2 sci-libs/gsl:0= sys-devel/gettext sys-libs/ncurses:0=
 DESCRIPTION=Program for statistical analysis of sampled data
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/pspp/pspp.html
+INHERIT=elisp-common python-any-r1 xdg-utils
 IUSE=cairo doc emacs examples gtk ncurses nls perl postgres test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=test? ( cairo )
 RESTRICT=!test? ( test )
 SLOT=0/1.2.0
 SRC_URI=mirror://gnu/pspp/pspp-1.2.0.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a1ef997b5a067861c3946ad29582b2a
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.0.2 b/metadata/md5-cache/sci-mathematics/singular-4.0.2
index b30b54c6c533..307794505c93 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.0.2
+++ b/metadata/md5-cache/sci-mathematics/singular-4.0.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0 >=dev-libs/ntl-5.5.1 emacs? ( >=app-editors/emacs-23.1:* ) sci-mathematics/flint sci-mathematics/4ti2 sci-libs/cddlib
 SLOT=0
 SRC_URI=https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-2/singular-4.0.2.tar.gz https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-2/singular-4.0.2-share.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=80b7d05c2105623d0d34a481c5f66520
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.0.3 b/metadata/md5-cache/sci-mathematics/singular-4.0.3
index cb6f5aadcfde..c8c84c5d5142 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.0.3
+++ b/metadata/md5-cache/sci-mathematics/singular-4.0.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0 >=dev-libs/ntl-5.5.1 emacs? ( >=app-editors/emacs-23.1:* ) sci-mathematics/flint sci-mathematics/4ti2 sci-libs/cddlib
 SLOT=0
 SRC_URI=https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-3/singular-4.0.3.tar.gz https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-3/singular-4.0.3-share.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=ac178387ea2f997b36808ae05691b400
diff --git a/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1 b/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1
index 8ea872573c45..2a299becaa45 100644
--- a/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1
+++ b/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/mlton-20180207 doc? ( virtual/latex-base app-text/texi2html )
 DESCRIPTION=Implementation of the logical framework LF
 EAPI=6
 HOMEPAGE=http://twelf.org/
+INHERIT=elisp-common eutils multilib
 IUSE=doc emacs examples
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
@@ -10,5 +11,5 @@ RDEPEND=>=dev-lang/mlton-20180207 doc? ( virtual/latex-base app-text/texi2html )
 RESTRICT=test
 SLOT=0/1.7.1
 SRC_URI=http://twelf.plparty.org/releases/twelf-src-1.7.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=a1987f8d95dd1a3bb1f46796568add50
diff --git a/metadata/md5-cache/sci-physics/root-6.22.06 b/metadata/md5-cache/sci-physics/root-6.22.06
index b07b380b3e0c..28573e998e83 100644
--- a/metadata/md5-cache/sci-physics/root-6.22.06
+++ b/metadata/md5-cache/sci-physics/root-6.22.06
@@ -4,6 +4,7 @@ DEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
 EAPI=7
 HOMEPAGE=https://root.cern
+INHERIT=cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs
 IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda cudnn +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc vmc +xml xrootd python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
@@ -12,5 +13,5 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asim
 RESTRICT=!test? ( test )
 SLOT=6.22/06
 SRC_URI=https://root.cern/download/root_v6.22.06.source.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	cuda	c2f1b334711bbbf2130f339636dc7515	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	fortran-2	b4796813ccda91c9c0d3463fc90aa969	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188
 _md5_=2583d2dc8ff8cd7970eda310c7fc5a80
diff --git a/metadata/md5-cache/sci-physics/root-9999 b/metadata/md5-cache/sci-physics/root-9999
index 2a918f62e190..a7f8430853c4 100644
--- a/metadata/md5-cache/sci-physics/root-9999
+++ b/metadata/md5-cache/sci-physics/root-9999
@@ -4,6 +4,7 @@ DEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
 EAPI=7
 HOMEPAGE=https://root.cern
+INHERIT=cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs git-r3
 IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda cudnn +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc vmc +xml xrootd python_single_target_python3_7 python_single_target_python3_8
 LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
 PROPERTIES=live
@@ -11,5 +12,5 @@ RDEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortra
 REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !opengl !qt5 ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	cuda	c2f1b334711bbbf2130f339636dc7515	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	fortran-2	b4796813ccda91c9c0d3463fc90aa969	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=cc6112604d6e4147dc558a810c22f4a3
diff --git a/metadata/md5-cache/sci-physics/thepeg-2.0.4 b/metadata/md5-cache/sci-physics/thepeg-2.0.4
index 233e6928d432..385ecae5a98f 100644
--- a/metadata/md5-cache/sci-physics/thepeg-2.0.4
+++ b/metadata/md5-cache/sci-physics/thepeg-2.0.4
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-phy
 RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=http://www.hepforge.org/archive/thepeg/ThePEG-2.0.4.tar.bz2 test? ( hepmc? ( http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq5l.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/GRV98nlo.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/MRST2001nlo.LHgrid ) )
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f
 _md5_=20348f4ff3394363b1a461ff0d67c6be
diff --git a/metadata/md5-cache/sci-visualization/epix-1.2.11-r2 b/metadata/md5-cache/sci-visualization/epix-1.2.11-r2
index 71d48ee654b6..2c61b361e1de 100644
--- a/metadata/md5-cache/sci-visualization/epix-1.2.11-r2
+++ b/metadata/md5-cache/sci-visualization/epix-1.2.11-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=https://mathcs.holycross.edu/~ahwang/epix/epix-1.2.11_withpdf.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=95b289831efcb82bc053ed0cf2c39779
diff --git a/metadata/md5-cache/sci-visualization/gle-4.2.5-r1 b/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
index ed81872f2677..4984697de143 100644
--- a/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
+++ b/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
@@ -10,5 +10,5 @@ LICENSE=BSD-2 emacs? ( GPL-2 )
 RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) doc? ( dev-texlive/texlive-latexextra ) emacs? ( >=app-editors/emacs-23.1:* ) app-text/ghostscript-gpl virtual/latex-base vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/glx/gle-graphics-4.2.5f-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=ce35930ca2410d436b628e37c9dbc097
diff --git a/metadata/md5-cache/sci-visualization/gri-2.12.23-r1 b/metadata/md5-cache/sci-visualization/gri-2.12.23-r1
index 4040f24632e4..4abe99110be9 100644
--- a/metadata/md5-cache/sci-visualization/gri-2.12.23-r1
+++ b/metadata/md5-cache/sci-visualization/gri-2.12.23-r1
@@ -3,11 +3,12 @@ DEPEND=app-text/ghostscript-gpl >=sci-libs/netcdf-4 virtual/latex-base virtual/i
 DESCRIPTION=Language for scientific graphics programming
 EAPI=5
 HOMEPAGE=http://gri.sourceforge.net/
+INHERIT=eutils elisp-common
 IUSE=doc emacs examples hdf5
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl >=sci-libs/netcdf-4 virtual/latex-base virtual/imagemagick-tools[png] emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://sourceforge/gri/gri-2.12.23.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
 _md5_=56811b1e97452f1a413db35b3a7669ea
diff --git a/metadata/md5-cache/sys-apps/qingy-1.0.0-r5 b/metadata/md5-cache/sys-apps/qingy-1.0.0-r5
index ac184a085100..4e35a479a921 100644
--- a/metadata/md5-cache/sys-apps/qingy-1.0.0-r5
+++ b/metadata/md5-cache/sys-apps/qingy-1.0.0-r5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.7-r7:= opensslcrypt? ( dev-libs/openssl:0= ) crypt? ( >=dev-libs/libgcrypt-1.2.1:0= ) emacs? ( >=app-editors/emacs-23.1:* ) pam? ( >=sys-libs/pam-0.75-r11 ) X? ( x11-libs/libX11:= x11-libs/libXScrnSaver:= ) pam? ( sys-auth/pambase )
 SLOT=0
 SRC_URI=mirror://sourceforge/qingy/qingy-1.0.0.tar.bz2 mirror://gentoo/qingy-gentoo-theme-2.1.tar.bz2 https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/qingy-1.0.0-screensavers.patch.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=43c5d57ff2fcd070846fedfd9b658092
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-7.9 b/metadata/md5-cache/sys-cluster/glusterfs-7.9
index 8376c7b2c628..3965c9059e0f 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-7.9
+++ b/metadata/md5-cache/sys-cluster/glusterfs-7.9
@@ -13,5 +13,5 @@ REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_7 python_single
 RESTRICT=test
 SLOT=0/7
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/7/7.9/glusterfs-7.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=14464ebf364e18d8bb592452c8885d44
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-8.3 b/metadata/md5-cache/sys-cluster/glusterfs-8.3
index cf89b39ac3ec..55cd92560f29 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-8.3
+++ b/metadata/md5-cache/sys-cluster/glusterfs-8.3
@@ -13,5 +13,5 @@ REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_7 python_single
 RESTRICT=test
 SLOT=0/8
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/8/8.3/glusterfs-8.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=461c879e654bbd8a7f8ea9eead490b5a
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-8.4 b/metadata/md5-cache/sys-cluster/glusterfs-8.4
index 0747aed771d6..0d8bacfb7ad5 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-8.4
+++ b/metadata/md5-cache/sys-cluster/glusterfs-8.4
@@ -13,5 +13,5 @@ REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_7 python_single
 RESTRICT=test
 SLOT=0/8
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/8/8.4/glusterfs-8.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=245c4411f285dcfedca7a6b15a0fa783
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-9.0 b/metadata/md5-cache/sys-cluster/glusterfs-9.0
index 7337fb3ff3d6..ddfb67591e4f 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-9.0
+++ b/metadata/md5-cache/sys-cluster/glusterfs-9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_7 python_single
 RESTRICT=test
 SLOT=0/9
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/9/9.0/glusterfs-9.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=245c4411f285dcfedca7a6b15a0fa783
diff --git a/metadata/md5-cache/x11-wm/ratpoison-1.4.9 b/metadata/md5-cache/x11-wm/ratpoison-1.4.9
index 2caf614ae09e..5f05f128d28c 100644
--- a/metadata/md5-cache/x11-wm/ratpoison-1.4.9
+++ b/metadata/md5-cache/x11-wm/ratpoison-1.4.9
@@ -3,11 +3,12 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xf
 DESCRIPTION=window manager without mouse dependency
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/ratpoison/
+INHERIT=elisp-common eutils toolchain-funcs
 IUSE=debug emacs +history sloppy +xft +xrandr
 KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libXtst
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/ratpoison/ratpoison-1.4.9.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=2f63b3d194918b34b46e2bf9433dfef6
diff --git a/metadata/md5-cache/x11-wm/ratpoison-9999 b/metadata/md5-cache/x11-wm/ratpoison-9999
index d81d73c1f3e3..9b198edf2f4b 100644
--- a/metadata/md5-cache/x11-wm/ratpoison-9999
+++ b/metadata/md5-cache/x11-wm/ratpoison-9999
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libXtst
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	d4b53ec63c580b993ed19445f411e1d2	git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=cdb861ecefd8b274b54b2d8256be0f20
diff --git a/metadata/md5-cache/x11-wm/sawfish-1.12.90-r1 b/metadata/md5-cache/x11-wm/sawfish-1.12.90-r1
index 940ed96978ac..79da2a3cb074 100644
--- a/metadata/md5-cache/x11-wm/sawfish-1.12.90-r1
+++ b/metadata/md5-cache/x11-wm/sawfish-1.12.90-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 Artistic-2
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) >=dev-libs/librep-0.92.1 >=x11-libs/rep-gtk-0.90.7 x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 >=x11-libs/gtk+-2.24.0:2 x11-libs/libXtst kde? ( kde-frameworks/kdelibs4support ) nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/sawfish/sawfish_1.12.90.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfa0484eb78bf7feaef7b41c576b6bce
diff --git a/metadata/md5-cache/x11-wm/stumpwm-18.05 b/metadata/md5-cache/x11-wm/stumpwm-18.05
index 568fc8d9ea1c..2686acf97301 100644
--- a/metadata/md5-cache/x11-wm/stumpwm-18.05
+++ b/metadata/md5-cache/x11-wm/stumpwm-18.05
@@ -12,5 +12,5 @@ RDEPEND=dev-lisp/alexandria dev-lisp/cl-ppcre dev-lisp/clx >=dev-lisp/sbcl-1.3.0
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=https://github.com/stumpwm/stumpwm/archive/18.05.tar.gz -> stumpwm-18.05.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	common-lisp-3	cc559c74a20195d5ca316bc53265018d	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	d4b53ec63c580b993ed19445f411e1d2	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	common-lisp-3	cc559c74a20195d5ca316bc53265018d	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=bfbe165f138147235de2728b12309b86
author	Repository mirror & CI <repomirrorci@gentoo.org>	2021-03-22 08:51:09 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2021-03-22 08:51:09 +0000
commit	33f2d770c28307b1e9a1199c681e1c543602c6d4 (patch)
tree	b3e2cf5bdb1a5f1ed8a908ee5fbd04989eadedbc /metadata/md5-cache
parent	Merge updates from master (diff)
download	gentoo-33f2d770c28307b1e9a1199c681e1c543602c6d4.tar.gz gentoo-33f2d770c28307b1e9a1199c681e1c543602c6d4.tar.bz2 gentoo-33f2d770c28307b1e9a1199c681e1c543602c6d4.zip