2021-03-26 21:50:58 UTC

221 files changed, 566 insertions, 554 deletions

diff --git a/metadata/md5-cache/media-fonts/Humor-Sans-1.0-r1 b/metadata/md5-cache/media-fonts/Humor-Sans-1.0-r1
index 1f6bdcf63055..9f6f695eb513 100644
--- a/metadata/md5-cache/media-fonts/Humor-Sans-1.0-r1
+++ b/metadata/md5-cache/media-fonts/Humor-Sans-1.0-r1
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Sans-serif typeface in the style of xkcd
 EAPI=7
 HOMEPAGE=http://antiyawn.com/uploads/humorsans.html
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://www.antiyawn.com/uploads/Humor-Sans-1.0.ttf
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=52fe63a2e7c1d726032bb4361e018e23
diff --git a/metadata/md5-cache/media-fonts/ahem-1.0 b/metadata/md5-cache/media-fonts/ahem-1.0
index f5b74741814e..665a77d44944 100644
--- a/metadata/md5-cache/media-fonts/ahem-1.0
+++ b/metadata/md5-cache/media-fonts/ahem-1.0
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Font to help test writers develop predictable tests
 EAPI=7
 HOMEPAGE=https://github.com/Kozea/Ahem
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=CC0-1.0
 SLOT=0
 SRC_URI=https://github.com/Kozea/Ahem/archive/1.0.tar.gz -> ahem-1.0.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=c972de8dfd18fc7cbf47bcc1c3212c1b
diff --git a/metadata/md5-cache/media-fonts/alee-fonts-13-r1 b/metadata/md5-cache/media-fonts/alee-fonts-13-r1
index 4f28b5517fcb..10a882532759 100644
--- a/metadata/md5-cache/media-fonts/alee-fonts-13-r1
+++ b/metadata/md5-cache/media-fonts/alee-fonts-13-r1
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Lee's Hangul truetype fonts
 EAPI=7
 HOMEPAGE=https://screenshots.debian.net/package/ttf-alee
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-lin
 LICENSE=Artistic
 SLOT=0
 SRC_URI=http://turul.canonical.com/pool/main/t/ttf-alee/ttf-alee_13.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=b73902e68784dab764b05055635963bc
diff --git a/metadata/md5-cache/media-fonts/alegreya-sans-2.008 b/metadata/md5-cache/media-fonts/alegreya-sans-2.008
index 24fe0f64bd63..096ba26f7a04 100644
--- a/metadata/md5-cache/media-fonts/alegreya-sans-2.008
+++ b/metadata/md5-cache/media-fonts/alegreya-sans-2.008
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Humanist sans-serif typeface with a calligraphic, dynamic feeling
 EAPI=7
 HOMEPAGE=https://www.huertatipografica.com/en/fonts/alegreya-sans-ht
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/huertatipografica/Alegreya-Sans/archive/v2.008.tar.gz -> alegreya-sans-2.008.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=3b8368db4723ff4c4f9d63672949a735
diff --git a/metadata/md5-cache/media-fonts/alegreya-serif-2.008 b/metadata/md5-cache/media-fonts/alegreya-serif-2.008
index f3f13981f29b..8a134068be63 100644
--- a/metadata/md5-cache/media-fonts/alegreya-serif-2.008
+++ b/metadata/md5-cache/media-fonts/alegreya-serif-2.008
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Alegreya serif type family
 EAPI=7
 HOMEPAGE=https://www.huertatipografica.com/en/fonts/alegreya-ht-pro
@@ -9,5 +9,5 @@ KEYWORDS=amd64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/huertatipografica/Alegreya/archive/v2.008.tar.gz -> alegreya-serif-2.008.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=dc71c39ad7ea721958756d560e753d23
diff --git a/metadata/md5-cache/media-fonts/andika-5.000 b/metadata/md5-cache/media-fonts/andika-5.000
index 75c0e16751eb..76a085c5c606 100644
--- a/metadata/md5-cache/media-fonts/andika-5.000
+++ b/metadata/md5-cache/media-fonts/andika-5.000
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Sans-serif font designed for literacy use
 EAPI=7
 HOMEPAGE=https://software.sil.org/andika/
@@ -10,5 +9,5 @@ KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/andika/Andika-5.000.zip -> andika-5.000.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=69869f315deb7969185db469c437a2b5
diff --git a/metadata/md5-cache/media-fonts/anonymous-pro-1.002-r1 b/metadata/md5-cache/media-fonts/anonymous-pro-1.002-r1
index 95c5ab70a976..9cf2f0946bd2 100644
--- a/metadata/md5-cache/media-fonts/anonymous-pro-1.002-r1
+++ b/metadata/md5-cache/media-fonts/anonymous-pro-1.002-r1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Monospaced truetype font designed with coding in mind
 EAPI=7
 HOMEPAGE=https://www.marksimonson.com/fonts/view/anonymous-pro
@@ -11,5 +10,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.marksimonson.com/assets/content/fonts/AnonymousPro-1.002.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=f3a24b6c2d1b2eacad09c1bfa8fa9228
diff --git a/metadata/md5-cache/media-fonts/aquafont-2.7-r4 b/metadata/md5-cache/media-fonts/aquafont-2.7-r4
index b4605b616de7..4601620b240b 100644
--- a/metadata/md5-cache/media-fonts/aquafont-2.7-r4
+++ b/metadata/md5-cache/media-fonts/aquafont-2.7-r4
@@ -1,14 +1,14 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Handwritten Japanese fixed-width TrueType font
 EAPI=7
 HOMEPAGE=http://www.geocities.jp/teardrops_in_aquablue/
+INHERIT=font
 IUSE=X X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=aquafont
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://www.geocities.jp/teardrops_in_aquablue/fnt/aqua2_7.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=f8166e26acfde38e5e55e83fc6b9c86a
diff --git a/metadata/md5-cache/media-fonts/aquapfont-2.6-r2 b/metadata/md5-cache/media-fonts/aquapfont-2.6-r2
index 74fe201ea28d..c2abf87e837a 100644
--- a/metadata/md5-cache/media-fonts/aquapfont-2.6-r2
+++ b/metadata/md5-cache/media-fonts/aquapfont-2.6-r2
@@ -1,14 +1,14 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Very pretty Japanese proportional truetype font
 EAPI=7
 HOMEPAGE=http://aquablue.milkcafe.to/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=aquafont
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://aquablue.milkcafe.to/tears/font/aquap2_6.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=556384c7681910676d30eec2869502f6
diff --git a/metadata/md5-cache/media-fonts/arabeyes-fonts-2.0-r1 b/metadata/md5-cache/media-fonts/arabeyes-fonts-2.0-r1
index 5f5d15e6a674..10cbaebe77f1 100644
--- a/metadata/md5-cache/media-fonts/arabeyes-fonts-2.0-r1
+++ b/metadata/md5-cache/media-fonts/arabeyes-fonts-2.0-r1
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Arabeyes Arabic TrueType fonts
 EAPI=7
 HOMEPAGE=https://www.arabeyes.org/Khotot#2.0
@@ -9,5 +9,5 @@ KEYWORDS=amd64 arm ~ia64 ppc s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/arabeyes/ae_fonts_2.0.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=7321c1a27a675b36e180c92f4ece9ea7
diff --git a/metadata/md5-cache/media-fonts/arkpandora-2.04 b/metadata/md5-cache/media-fonts/arkpandora-2.04
index 824593213f44..713822769984 100644
--- a/metadata/md5-cache/media-fonts/arkpandora-2.04
+++ b/metadata/md5-cache/media-fonts/arkpandora-2.04
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Replacement fonts for Microsoft's Arial, Times, and Verdana fonts
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 s390 sparc x86
 LICENSE=BitstreamVera
 SLOT=0
 SRC_URI=mirror://gentoo/ttf-arkpandora-2.04.tgz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=5fa3b2c445396e2da5502d978cc5943d
diff --git a/metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1-r2 b/metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1-r2
index 64847008d382..c33a599486dd 100644
--- a/metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1-r2
+++ b/metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1-r2
@@ -1,6 +1,5 @@
-BDEPEND=media-gfx/fontforge
+BDEPEND=media-gfx/fontforge X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Chinese TrueType Arphic Fonts
 EAPI=7
 HOMEPAGE=http://www.arphic.com.tw/ https://www.freedesktop.org/wiki/Software/CJKUnifonts
@@ -11,5 +10,5 @@ LICENSE=Arphic
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/chinese-fonts-truetype/gkai00mp.ttf.gz mirror://gnu/non-gnu/chinese-fonts-truetype/bkai00mp.ttf.gz mirror://gnu/non-gnu/chinese-fonts-truetype/bsmi00lp.ttf.gz mirror://gnu/non-gnu/chinese-fonts-truetype/gbsn00lp.ttf.gz mirror://ubuntu/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_0.2.20080216.1.orig.tar.gz mirror://ubuntu/pool/main/t/ttf-arphic-ukai/ttf-arphic-ukai_0.2.20080216.1.orig.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=font	0667878c2b594871023dd1833d05996f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b69ca02afcb73a4e708260438a42baa
diff --git a/metadata/md5-cache/media-fonts/artwiz-aleczapka-en-1.3 b/metadata/md5-cache/media-fonts/artwiz-aleczapka-en-1.3
index 76bbe95e90a2..86164f26d581 100644
--- a/metadata/md5-cache/media-fonts/artwiz-aleczapka-en-1.3
+++ b/metadata/md5-cache/media-fonts/artwiz-aleczapka-en-1.3
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Artwiz Aleczapko fonts
 EAPI=7
 HOMEPAGE=http://artwizaleczapka.sourceforge.net/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/artwizaleczapka/artwiz-aleczapka-en-1.3.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=6c70ae3983a919898c3f84eba113caa6
diff --git a/metadata/md5-cache/media-fonts/artwiz-latin1-1.1 b/metadata/md5-cache/media-fonts/artwiz-latin1-1.1
index 4efc52740b53..388465299cdc 100644
--- a/metadata/md5-cache/media-fonts/artwiz-latin1-1.1
+++ b/metadata/md5-cache/media-fonts/artwiz-latin1-1.1
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=A set of improved Artwiz fonts with bold and full ISO-8859-1 support
 EAPI=7
 HOMEPAGE=http://artwiz-latin1.sourceforge.net/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/artwiz-latin1/artwiz-latin1-1.1.tgz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=87cca39089b9b6ed9bed842e4cde7785
diff --git a/metadata/md5-cache/media-fonts/baekmuk-fonts-2.2-r2 b/metadata/md5-cache/media-fonts/baekmuk-fonts-2.2-r2
index d2cca0376cc7..92d75a523d06 100644
--- a/metadata/md5-cache/media-fonts/baekmuk-fonts-2.2-r2
+++ b/metadata/md5-cache/media-fonts/baekmuk-fonts-2.2-r2
@@ -1,5 +1,6 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=X? ( media-gfx/ebdftopcf )
 DESCRIPTION=Korean Baekmuk Font
 EAPI=7
 HOMEPAGE=https://kldp.net/baekmuk/
@@ -10,5 +11,5 @@ LICENSE=BSD
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://kldp.net/baekmuk/release/865-baekmuk-bdf-2.2.tar.gz -> baekmuk-bdf-2.2.tar.gz https://kldp.net/baekmuk/release/865-baekmuk-ttf-2.2.tar.gz -> baekmuk-ttf-2.2.tar.gz unicode? ( mirror://gentoo/baekmuk-unicode-bdf-20020418.tar.bz2 )
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
+_eclasses_=font	0667878c2b594871023dd1833d05996f	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
 _md5_=382ab5c25f3c61821016fbf2ddcc3db0
diff --git a/metadata/md5-cache/media-fonts/bitstream-cyberbit-2.0-r2 b/metadata/md5-cache/media-fonts/bitstream-cyberbit-2.0-r2
index 9cff7b764830..61569a7afaa8 100644
--- a/metadata/md5-cache/media-fonts/bitstream-cyberbit-2.0-r2
+++ b/metadata/md5-cache/media-fonts/bitstream-cyberbit-2.0-r2
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Cyberbit Unicode (including CJK) font
 EAPI=7
 HOMEPAGE=http://www.bitstream.com/
@@ -11,5 +10,5 @@ LICENSE=BitstreamCyberbit
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://freebsd.nsu.ru/distfiles/cyberbit/Cyberbit.ZIP -> bitstream-cyberbit-2.0.zip https://www.minix3.org/distfiles-backup/cyberbit-ttf/Cyberbit.ZIP -> bitstream-cyberbit-2.0.zip http://mirror.uni-c.dk/pub/pkgsrc/distfiles/cyberbit-ttf/Cyberbit.ZIP -> bitstream-cyberbit-2.0.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=eac3cd6e1634127fa7f86e156ca52396
diff --git a/metadata/md5-cache/media-fonts/cantarell-0.201 b/metadata/md5-cache/media-fonts/cantarell-0.201
index 9142e30edc42..2b1543c4f8d6 100644
--- a/metadata/md5-cache/media-fonts/cantarell-0.201
+++ b/metadata/md5-cache/media-fonts/cantarell-0.201
@@ -1,6 +1,5 @@
-BDEPEND=>=sys-devel/gettext-0.20 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=>=sys-devel/gettext-0.20 virtual/pkgconfig X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Default fontset for GNOME Shell
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/CantarellFonts
@@ -11,5 +10,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/cantarell-fonts/0.201/cantarell-fonts-0.201.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	gnome.org	4d6de9e2337521f60965d1a9a118761f	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	meson	e43eef9331f54965a573ed380854ff47
+_eclasses_=font	0667878c2b594871023dd1833d05996f	gnome.org	4d6de9e2337521f60965d1a9a118761f	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	meson	e43eef9331f54965a573ed380854ff47
 _md5_=b482108434a87fa026cdb066cd9c7b79
diff --git a/metadata/md5-cache/media-fonts/cantarell-0.301 b/metadata/md5-cache/media-fonts/cantarell-0.301
index 06c644a04f1b..c3c109c6497e 100644
--- a/metadata/md5-cache/media-fonts/cantarell-0.301
+++ b/metadata/md5-cache/media-fonts/cantarell-0.301
@@ -1,6 +1,5 @@
-BDEPEND=>=sys-devel/gettext-0.20 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=>=sys-devel/gettext-0.20 virtual/pkgconfig X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Default fontset for GNOME Shell
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/CantarellFonts
@@ -11,5 +10,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/cantarell-fonts/0.301/cantarell-fonts-0.301.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	gnome.org	4d6de9e2337521f60965d1a9a118761f	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	meson	e43eef9331f54965a573ed380854ff47
+_eclasses_=font	0667878c2b594871023dd1833d05996f	gnome.org	4d6de9e2337521f60965d1a9a118761f	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	meson	e43eef9331f54965a573ed380854ff47
 _md5_=cd51ec00ee909f237bfc7ed2f78331b2
diff --git a/metadata/md5-cache/media-fonts/cardo-1.04 b/metadata/md5-cache/media-fonts/cardo-1.04
index 00fab78961d7..e96c068f582e 100644
--- a/metadata/md5-cache/media-fonts/cardo-1.04
+++ b/metadata/md5-cache/media-fonts/cardo-1.04
@@ -1,13 +1,13 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Unicode font for classicists, medievalists and linguists
 EAPI=7
 HOMEPAGE=http://scholarsfonts.net/cardofnt.html
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://scholarsfonts.net/cardo104.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=ddef74f1044ab2c69bd7b6697434eaca
diff --git a/metadata/md5-cache/media-fonts/cascadia-code-2102.25 b/metadata/md5-cache/media-fonts/cascadia-code-2102.25
index 19b8755b3806..ba049ceff178 100644
--- a/metadata/md5-cache/media-fonts/cascadia-code-2102.25
+++ b/metadata/md5-cache/media-fonts/cascadia-code-2102.25
@@ -1,13 +1,13 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=A monospaced font developed for Windows Terminal
 EAPI=7
 HOMEPAGE=https://github.com/microsoft/cascadia-code
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/microsoft/cascadia-code/releases/download/v2102.25/CascadiaCode-2102.25.zip -> cascadia-code-2102.25.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=873a6c6fa110c3777d9ae6d6e46c4763
diff --git a/metadata/md5-cache/media-fonts/cheapskatefonts-1.0 b/metadata/md5-cache/media-fonts/cheapskatefonts-1.0
index e60f4db2a4c1..5fbe51069c50 100644
--- a/metadata/md5-cache/media-fonts/cheapskatefonts-1.0
+++ b/metadata/md5-cache/media-fonts/cheapskatefonts-1.0
@@ -1,13 +1,13 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Dustismo's decorative font collection
 EAPI=7
 HOMEPAGE=http://www.dustismo.com/site/fonts.html
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.dustismo.com/fonts/Domestic_Manners.zip http://www.dustismo.com/fonts/PenguinAttack.zip http://www.dustismo.com/fonts/Dustismo.zip http://www.dustismo.com/fonts/El_Abogado_Loco.zip http://www.dustismo.com/fonts/Progenisis.zip http://www.dustismo.com/fonts/flatline.zip http://www.dustismo.com/fonts/MarkedFool.zip http://www.dustismo.com/fonts/ItWasntMe.zip http://www.dustismo.com/fonts/balker.zip http://www.dustismo.com/fonts/Swift.zip http://www.dustismo.com/fonts/Wargames.zip http://www.dustismo.com/fonts/Winks.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=36e02a780cbed97e1dc74f9e8ff04a07
diff --git a/metadata/md5-cache/media-fonts/clearsans-1.00 b/metadata/md5-cache/media-fonts/clearsans-1.00
index 29d30236233c..9e9bb518e1ff 100644
--- a/metadata/md5-cache/media-fonts/clearsans-1.00
+++ b/metadata/md5-cache/media-fonts/clearsans-1.00
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=OpenType font optimized for readability on small screens
 EAPI=7
 HOMEPAGE=https://01.org/clear-sans
@@ -11,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/downloads/clear-sans/clearsans-1.00.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=6099aacc1185f28e2af1ea3a2330b314
diff --git a/metadata/md5-cache/media-fonts/cm-unicode-0.7.0-r1 b/metadata/md5-cache/media-fonts/cm-unicode-0.7.0-r1
index cad8ed73e7e4..3c1c9233cd1e 100644
--- a/metadata/md5-cache/media-fonts/cm-unicode-0.7.0-r1
+++ b/metadata/md5-cache/media-fonts/cm-unicode-0.7.0-r1
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Computer Modern Unicode fonts
 EAPI=7
 HOMEPAGE=https://cm-unicode.sourceforge.io/
@@ -9,5 +9,5 @@ KEYWORDS=amd64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/cm-unicode/0.7.0/cm-unicode-0.7.0-ttf.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=72c1a68080a33928b389aae109d9d00f
diff --git a/metadata/md5-cache/media-fonts/comic-neue-2.3 b/metadata/md5-cache/media-fonts/comic-neue-2.3
index da8aa4e4c863..dfbb166fcd53 100644
--- a/metadata/md5-cache/media-fonts/comic-neue-2.3
+++ b/metadata/md5-cache/media-fonts/comic-neue-2.3
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Typographically savvy casual script typeface
 EAPI=7
 HOMEPAGE=http://comicneue.com
@@ -10,5 +9,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-lin
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://comicneue.com/comic-neue-2.3.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=b31e538ef3f284d7ccc0ab9c9f27bb4b
diff --git a/metadata/md5-cache/media-fonts/corefonts-1-r7 b/metadata/md5-cache/media-fonts/corefonts-1-r7
index b189ed17534b..18a106884263 100644
--- a/metadata/md5-cache/media-fonts/corefonts-1-r7
+++ b/metadata/md5-cache/media-fonts/corefonts-1-r7
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/cabextract
+BDEPEND=app-arch/cabextract X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Microsoft's TrueType core fonts
 EAPI=7
 HOMEPAGE=http://corefonts.sourceforge.net/
@@ -10,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd6
 LICENSE=MSttfEULA
 SLOT=0
 SRC_URI=mirror://gentoo/EUupdate.EXE mirror://sourceforge/corefonts/andale32.exe mirror://sourceforge/corefonts/arialb32.exe mirror://sourceforge/corefonts/comic32.exe mirror://sourceforge/corefonts/courie32.exe mirror://sourceforge/corefonts/georgi32.exe mirror://sourceforge/corefonts/impact32.exe mirror://sourceforge/corefonts/webdin32.exe mirror://sourceforge/corefonts/wd97vwr32.exe
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=c20063992d9257e563d23168811f8448
diff --git a/metadata/md5-cache/media-fonts/courier-prime-1.203 b/metadata/md5-cache/media-fonts/courier-prime-1.203
index fd690c5ef3f6..1dd13afb0c26 100644
--- a/metadata/md5-cache/media-fonts/courier-prime-1.203
+++ b/metadata/md5-cache/media-fonts/courier-prime-1.203
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Redesign of Courier
 EAPI=7
 HOMEPAGE=https://www.quoteunquoteapps.com/courierprime/
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/courier-prime-1.203.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=d98ed2ea6b91c3c4385d9481ffdff1f4
diff --git a/metadata/md5-cache/media-fonts/cronyx-fonts-2.3.8 b/metadata/md5-cache/media-fonts/cronyx-fonts-2.3.8
index 48763048c807..2cb4f5cd65cc 100644
--- a/metadata/md5-cache/media-fonts/cronyx-fonts-2.3.8
+++ b/metadata/md5-cache/media-fonts/cronyx-fonts-2.3.8
@@ -1,12 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=X? ( media-gfx/ebdftopcf )
 DESCRIPTION=Cronyx Cyrillic bitmap fonts for X
 EAPI=7
 HOMEPAGE=https://packages.debian.org/source/sid/xfonts-cronyx
+INHERIT=font font-ebdftopcf
 IUSE=X X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc s390 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xfonts-cronyx/xfonts-cronyx_2.3.8.orig.tar.gz mirror://debian/pool/main/x/xfonts-cronyx/xfonts-cronyx_2.3.8-6.diff.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
+_eclasses_=font	0667878c2b594871023dd1833d05996f	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
 _md5_=c1bd6dd24e50e1255f5a01325099e4dc
diff --git a/metadata/md5-cache/media-fonts/croscorefonts-1.31.0 b/metadata/md5-cache/media-fonts/croscorefonts-1.31.0
index 6feea4752804..f2406a7ecd09 100644
--- a/metadata/md5-cache/media-fonts/croscorefonts-1.31.0
+++ b/metadata/md5-cache/media-fonts/croscorefonts-1.31.0
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Open licensed fonts metrically compatible with MS corefonts
 EAPI=7
 HOMEPAGE=https://www.google.com/webfonts/specimen/Arimo https://www.google.com/webfonts/specimen/Cousine https://www.google.com/webfonts/specimen/Tinos
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/croscorefonts-1.31.0.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=7951dd7c358c157c9495d387710d8042
diff --git a/metadata/md5-cache/media-fonts/crosextrafonts-caladea-20130214 b/metadata/md5-cache/media-fonts/crosextrafonts-caladea-20130214
index 66cebd235672..323880dd62c4 100644
--- a/metadata/md5-cache/media-fonts/crosextrafonts-caladea-20130214
+++ b/metadata/md5-cache/media-fonts/crosextrafonts-caladea-20130214
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Open licensed serif font metrically compatible with Cambria
 EAPI=7
 HOMEPAGE=https://bugs.chromium.org/p/chromium/issues/detail?id=168879
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-20130214.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=bf2dec3aec1586c33a8e0e7b144f64d7
diff --git a/metadata/md5-cache/media-fonts/crosextrafonts-carlito-20130920 b/metadata/md5-cache/media-fonts/crosextrafonts-carlito-20130920
index 4a34892ba621..114dcd42c120 100644
--- a/metadata/md5-cache/media-fonts/crosextrafonts-carlito-20130920
+++ b/metadata/md5-cache/media-fonts/crosextrafonts-carlito-20130920
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Open licensed sans-serif font metrically compatible with Calibri
 EAPI=7
 HOMEPAGE=https://bugs.chromium.org/p/chromium/issues/detail?id=280557
@@ -10,5 +10,5 @@ LICENSE=OFL
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-20130920.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=08ed4d62b55a74d7ed47585826c70a16
diff --git a/metadata/md5-cache/media-fonts/culmus-0.133-r1 b/metadata/md5-cache/media-fonts/culmus-0.133-r1
index df03904c77e2..f7a7ec031a70 100644
--- a/metadata/md5-cache/media-fonts/culmus-0.133-r1
+++ b/metadata/md5-cache/media-fonts/culmus-0.133-r1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip >=x11-apps/mkfontscale-1.0.9-r1 fontforge? ( media-gfx/fontforge )
+BDEPEND=app-arch/unzip >=x11-apps/mkfontscale-1.0.9-r1 fontforge? ( media-gfx/fontforge ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Hebrew Type1 fonts
 EAPI=7
 HOMEPAGE=http://culmus.sourceforge.net/
@@ -11,5 +10,5 @@ LICENSE=|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )
 RDEPEND=!media-fonts/culmus-ancient
 SLOT=0
 SRC_URI=mirror://sourceforge/culmus/culmus-0.133.tar.gz mirror://sourceforge/culmus/culmus-type1-0.105.tar.gz fontforge? ( mirror://sourceforge/culmus/culmus-src-0.133.tar.gz ) ancient? ( !fontforge? ( mirror://sourceforge/culmus/AncientSemiticFonts-0.06-1.TTF.tgz ) fontforge? ( mirror://sourceforge/culmus/AncientSemiticFonts-0.06-1.tgz ) ) fancy? ( http://culmus.sourceforge.net/fancy/journal.tar.gz http://culmus.sourceforge.net/fancy/hillel.tar.gz http://culmus.sourceforge.net/fancy/anka.tar.gz http://culmus.sourceforge.net/fancy/comix.tar.gz http://culmus.sourceforge.net/fancy/gan.tar.gz http://culmus.sourceforge.net/fancy/ozrad.tar.gz http://culmus.sourceforge.net/fancy/ktav-yad.tar.gz http://culmus.sourceforge.net/fancy/dorian.tar.gz http://culmus.sourceforge.net/fancy/gladia.tar.gz http://culmus.sourceforge.net/fancy/horev.tar.gz ) fancy? ( http://culmus.sourceforge.net/fancy-yg/ShmuelCLM.zip http://culmus.sourceforge.net/fancy-yg/MakabiYG.zip ) taamey? ( http://culmus.sourceforge.net/taamim/TaameyDavidCLM.zip http://culmus.sourceforge.net/taamim/TaameyFrankCLM.zip http://culmus.sourceforge.net/taamim/KeterAramTsova.zip http://culmus.sourceforge.net/taamim/KeterYG.zip )
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=22f6c4abca3d2b9222229b1b46176c01
diff --git a/metadata/md5-cache/media-fonts/dejavu-2.37 b/metadata/md5-cache/media-fonts/dejavu-2.37
index f09059c85255..862f78540365 100644
--- a/metadata/md5-cache/media-fonts/dejavu-2.37
+++ b/metadata/md5-cache/media-fonts/dejavu-2.37
@@ -1,6 +1,5 @@
-BDEPEND=fontforge? ( app-i18n/unicode-data dev-perl/Font-TTF >=media-gfx/fontforge-20080429 >media-libs/fontconfig-2.6.0:1.0 >=x11-apps/mkfontscale-1.2.0 )
+BDEPEND=fontforge? ( app-i18n/unicode-data dev-perl/Font-TTF >=media-gfx/fontforge-20080429 >media-libs/fontconfig-2.6.0:1.0 >=x11-apps/mkfontscale-1.2.0 ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=DejaVu fonts, bitstream vera with ISO-8859-2 characters
 EAPI=7
 HOMEPAGE=https://dejavu-fonts.github.io/
@@ -10,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64
 LICENSE=BitstreamVera
 SLOT=0
 SRC_URI=!fontforge? ( mirror://sourceforge/dejavu/dejavu-fonts-ttf-2.37.tar.bz2 ) fontforge? ( mirror://sourceforge/dejavu/dejavu-fonts-2.37.tar.bz2 )
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=font	0667878c2b594871023dd1833d05996f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2d3185e709c27a6f1c850bd24bd2a46
diff --git a/metadata/md5-cache/media-fonts/dina-2.93 b/metadata/md5-cache/media-fonts/dina-2.93
index 16e748c92564..4b7de328bd6d 100644
--- a/metadata/md5-cache/media-fonts/dina-2.93
+++ b/metadata/md5-cache/media-fonts/dina-2.93
@@ -1,6 +1,6 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=X? ( media-gfx/ebdftopcf )
 DESCRIPTION=Monospace bitmap font, primarily aimed at programmers
 EAPI=7
 HOMEPAGE=https://www.dcmembers.com/jibsen/download/61/
@@ -11,5 +11,5 @@ LICENSE=MIT
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=https://www.donationcoder.com/forum/index.php?action=dlattach;topic=36049.0;attach=78562 -> dina-2.93.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
+_eclasses_=font	0667878c2b594871023dd1833d05996f	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
 _md5_=f1b82f1f6dec684927cc234803736c2a
diff --git a/metadata/md5-cache/media-fonts/droid-113-r5 b/metadata/md5-cache/media-fonts/droid-113-r5
index c7651c790459..9973f93e496d 100644
--- a/metadata/md5-cache/media-fonts/droid-113-r5
+++ b/metadata/md5-cache/media-fonts/droid-113-r5
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Font family from Google's Android project
 EAPI=7
 HOMEPAGE=https://www.cosmix.org/software/#Drois%20Sans%20Mono%20%28Slashed%20Zero%29
@@ -9,5 +9,5 @@ KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://gentoo/droid-113-r1.tar.bz2 mirror://gentoo/DroidSansMonoSlashed-112_p1.ttf.bz2 mirror://gentoo/DroidSansMonoDotted-112_p1.ttf.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=40f4f6ad7942b6fa925b03f722bf4e25
diff --git a/metadata/md5-cache/media-fonts/dzongkha-fonts-2009.09-r1 b/metadata/md5-cache/media-fonts/dzongkha-fonts-2009.09-r1
index 51b2a59f2560..908e777bf38a 100644
--- a/metadata/md5-cache/media-fonts/dzongkha-fonts-2009.09-r1
+++ b/metadata/md5-cache/media-fonts/dzongkha-fonts-2009.09-r1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Bhutanese/Tibetan fonts for dzongkha script provided by the Bhutanese government
 EAPI=7
 HOMEPAGE=https://www.dit.gov.bt/downloads
@@ -11,5 +10,5 @@ LICENSE=all-rights-reserved
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://www.dit.gov.bt/sites/default/files/dzongkhafonts.zip -> dzongkha-fonts-2009.09.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=b21cb88ad4a21dc25aa5ae8711c4768e
diff --git a/metadata/md5-cache/media-fonts/eb-garamond-0.016 b/metadata/md5-cache/media-fonts/eb-garamond-0.016
index 237ce8ce41e7..f4907a417b98 100644
--- a/metadata/md5-cache/media-fonts/eb-garamond-0.016
+++ b/metadata/md5-cache/media-fonts/eb-garamond-0.016
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Claude Garamont's humanist typeface from the mid-16th century
 EAPI=7
 HOMEPAGE=http://www.georgduffner.at/ebgaramond/
@@ -10,5 +9,5 @@ KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-0.016.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=582daf244bc43b3032b28644e8a55bee
diff --git a/metadata/md5-cache/media-fonts/efont-unicode-0.4.2-r1 b/metadata/md5-cache/media-fonts/efont-unicode-0.4.2-r1
index fc5703bf22b4..656758625228 100644
--- a/metadata/md5-cache/media-fonts/efont-unicode-0.4.2-r1
+++ b/metadata/md5-cache/media-fonts/efont-unicode-0.4.2-r1
@@ -1,13 +1,15 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=X? ( media-gfx/ebdftopcf )
 DESCRIPTION=The /efont/ Unicode Bitmap Fonts
 EAPI=7
 HOMEPAGE=http://openlab.jp/efont/unicode/
+INHERIT=font font-ebdftopcf
 IUSE=X X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos
 LICENSE=public-domain BAEKMUK BSD MIT HPND free-noncomm
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://openlab.jp/efont/dist/unicode-bdf/efont-unicode-bdf-0.4.2.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
+_eclasses_=font	0667878c2b594871023dd1833d05996f	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
 _md5_=686d531394dc39cd4fdc2037fc5164d4
diff --git a/metadata/md5-cache/media-fonts/ekushey-bangla-fonts-20070420 b/metadata/md5-cache/media-fonts/ekushey-bangla-fonts-20070420
index 6b534c204c3c..42c84d1f37f7 100644
--- a/metadata/md5-cache/media-fonts/ekushey-bangla-fonts-20070420
+++ b/metadata/md5-cache/media-fonts/ekushey-bangla-fonts-20070420
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=A collection of Free fonts for the Bangla (Bengali) script
 EAPI=7
 HOMEPAGE=http://ekushey.org/index.php/page/otf_bangla_fonts
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ OFL
 SLOT=0
 SRC_URI=mirror://sourceforge/ekushey/Lohit_14-04-2007.ttf mirror://sourceforge/ekushey/Mohua_07-09-05.ttf mirror://sourceforge/ekushey/Godhuli_03-09-2005.ttf mirror://sourceforge/ekushey/Puja-17-06-2006.ttf mirror://sourceforge/ekushey/Durga_03-09-2005.ttf mirror://sourceforge/ekushey/Saraswatii_03-09-2005.ttf mirror://sourceforge/ekushey/Sharifa_03-09-2005.ttf mirror://sourceforge/ekushey/Sumit_03-09-2005.ttf mirror://sourceforge/ekushey/Punarbhaba_27-02-2006.ttf mirror://sourceforge/ekushey/SolaimanLipi_20-04-07.ttf mirror://sourceforge/ekushey/Rupali_01-02-2007.ttf
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=6d497039784263dfcd74402f4a1c8ed4
diff --git a/metadata/md5-cache/media-fonts/encodings-1.0.5-r1 b/metadata/md5-cache/media-fonts/encodings-1.0.5-r1
index a3dbeb9caa73..b238931101e8 100644
--- a/metadata/md5-cache/media-fonts/encodings-1.0.5-r1
+++ b/metadata/md5-cache/media-fonts/encodings-1.0.5-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/encodings-1.0.5.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=font	0667878c2b594871023dd1833d05996f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=2ae081c5c97c913d8c0ae524df1b2aa2
diff --git a/metadata/md5-cache/media-fonts/essays1743-2.100 b/metadata/md5-cache/media-fonts/essays1743-2.100
index 443a54124cd7..c90454d79911 100644
--- a/metadata/md5-cache/media-fonts/essays1743-2.100
+++ b/metadata/md5-cache/media-fonts/essays1743-2.100
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=John Stracke's Essays 1743 font
 EAPI=7
 HOMEPAGE=https://www.thibault.org/fonts/essays/
@@ -10,5 +10,5 @@ LICENSE=|| ( LGPL-2.1 OFL-1.1 )
 REQUIRED_USE=|| ( otf ttf )
 SLOT=0
 SRC_URI=otf? ( https://www.thibault.org/fonts/essays/essays1743-2.100-1-otf.tar.gz ) ttf? ( https://www.thibault.org/fonts/essays/essays1743-2.100-1-ttf.tar.gz )
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=01e99dee4f04f1fe7efb34037e9b573e
diff --git a/metadata/md5-cache/media-fonts/exljbris-free-20100320 b/metadata/md5-cache/media-fonts/exljbris-free-20100320
index dbdcfb83a7b1..1060ffbd1fec 100644
--- a/metadata/md5-cache/media-fonts/exljbris-free-20100320
+++ b/metadata/md5-cache/media-fonts/exljbris-free-20100320
@@ -1,14 +1,14 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Beautiful free fonts from exljbris Font Foundry
 EAPI=7
 HOMEPAGE=http://www.josbuivenga.demon.nl/
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~x86
 LICENSE=exljbris-free
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.exljbris.com/dl/delicious-123.zip http://www.exljbris.com/dl/Diavlo_II_37b2.zip http://www.exljbris.com/dl/fontin2_pc.zip http://www.exljbris.com/dl/FontinSans_49.zip http://www.exljbris.com/dl/tallys_15b2.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=5e732d520649d4cd88416bd0be2b66ab
diff --git a/metadata/md5-cache/media-fonts/exo-2 b/metadata/md5-cache/media-fonts/exo-2
index 0bc24ac8dd7b..1dce33560159 100644
--- a/metadata/md5-cache/media-fonts/exo-2
+++ b/metadata/md5-cache/media-fonts/exo-2
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Geometric sans-serif font with a technological feel
 EAPI=7
 HOMEPAGE=https://www.ndiscover.com/exo-2-0/
@@ -9,5 +9,5 @@ KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/exo-2.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=931c4c82a50c6b4fb270d6c79cbbcdc9
diff --git a/metadata/md5-cache/media-fonts/fantasque-sans-mono-1.8.0 b/metadata/md5-cache/media-fonts/fantasque-sans-mono-1.8.0
index b08b3b696bae..b7b2db8b8a2d 100644
--- a/metadata/md5-cache/media-fonts/fantasque-sans-mono-1.8.0
+++ b/metadata/md5-cache/media-fonts/fantasque-sans-mono-1.8.0
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=A font family with a great monospaced variant for programmers
 EAPI=7
 HOMEPAGE=https://github.com/belluzj/fantasque-sans
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/belluzj/fantasque-sans/releases/download/v1.8.0/FantasqueSansMono-Normal.tar.gz -> fantasque-sans-mono-1.8.0.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=f899bcfa89115c8f73d2b94acad245b0
diff --git a/metadata/md5-cache/media-fonts/farsi-fonts-0.4 b/metadata/md5-cache/media-fonts/farsi-fonts-0.4
index 26cd60673f13..ab4ad1ac9172 100644
--- a/metadata/md5-cache/media-fonts/farsi-fonts-0.4
+++ b/metadata/md5-cache/media-fonts/farsi-fonts-0.4
@@ -1,13 +1,13 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Farsi (Persian) Unicode fonts
 EAPI=7
 HOMEPAGE=http://www.farsiweb.ir/wiki/Products/PersianFonts
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86 ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.farsiweb.ir/font/farsifonts-0.4.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=a98b703c2deeae4ed6af40a7fc4854a6
diff --git a/metadata/md5-cache/media-fonts/fgdc-emergency-2.20 b/metadata/md5-cache/media-fonts/fgdc-emergency-2.20
index ab3a75f5b26a..27362da89d47 100644
--- a/metadata/md5-cache/media-fonts/fgdc-emergency-2.20
+++ b/metadata/md5-cache/media-fonts/fgdc-emergency-2.20
@@ -1,12 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=app-arch/unzip
 DESCRIPTION=FGDC Emergency Response Symbology Prototype
 EAPI=7
 HOMEPAGE=http://www.fgdc.gov/HSWG/
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.fgdc.gov/HSWG/symbol_downloads/ers_v220.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=1fd2ab4906e05727a127a895880dbad2
diff --git a/metadata/md5-cache/media-fonts/fifth-leg-0.6-r1 b/metadata/md5-cache/media-fonts/fifth-leg-0.6-r1
index 33288ac3643f..df5b5631b8be 100644
--- a/metadata/md5-cache/media-fonts/fifth-leg-0.6-r1
+++ b/metadata/md5-cache/media-fonts/fifth-leg-0.6-r1
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Simplistic, technical sans serif - openSUSE font
 EAPI=7
 HOMEPAGE=https://jimmac.eu/
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=OFL
 SLOT=0
 SRC_URI=https://api.opensuse.org/public/source/openSUSE:12.2/fifth-leg-font/opensuse-font-fifth-leg-0.6.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=e6cad9448d968834eb0005719909665a
diff --git a/metadata/md5-cache/media-fonts/fira-code-4 b/metadata/md5-cache/media-fonts/fira-code-4
index 29911c572a7f..86fbd07e91c8 100644
--- a/metadata/md5-cache/media-fonts/fira-code-4
+++ b/metadata/md5-cache/media-fonts/fira-code-4
@@ -1,12 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=app-arch/unzip
 DESCRIPTION=Monospaced font with programming ligatures
 EAPI=7
 HOMEPAGE=https://github.com/tonsky/FiraCode
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/tonsky/FiraCode/archive/4.tar.gz -> fira-code-4.tar.gz https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=62f5aa6aec1ab5f34fd1f921578f1b25
diff --git a/metadata/md5-cache/media-fonts/fira-code-5.2 b/metadata/md5-cache/media-fonts/fira-code-5.2
index 69e6ca252853..5b0bf723b629 100644
--- a/metadata/md5-cache/media-fonts/fira-code-5.2
+++ b/metadata/md5-cache/media-fonts/fira-code-5.2
@@ -1,12 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=app-arch/unzip
 DESCRIPTION=Monospaced font with programming ligatures
 EAPI=7
 HOMEPAGE=https://github.com/tonsky/FiraCode
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/tonsky/FiraCode/archive/5.2.tar.gz -> fira-code-5.2.tar.gz https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=62f5aa6aec1ab5f34fd1f921578f1b25
diff --git a/metadata/md5-cache/media-fonts/fira-mono-4.202 b/metadata/md5-cache/media-fonts/fira-mono-4.202
index 923ef97ea312..9d9575cc90d0 100644
--- a/metadata/md5-cache/media-fonts/fira-mono-4.202
+++ b/metadata/md5-cache/media-fonts/fira-mono-4.202
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Default monospaced typeface for FirefoxOS, designed for legibility
 EAPI=7
 HOMEPAGE=https://mozilla.github.io/Fira
+INHERIT=font
 IUSE=+otf ttf X
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL-1.1
 REQUIRED_USE=|| ( otf ttf )
 SLOT=0
 SRC_URI=https://github.com/mozilla/Fira/archive/4.202.tar.gz -> Fira-4.202.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=bec4a5e826594a0a96ab5326b4251844
diff --git a/metadata/md5-cache/media-fonts/fira-sans-4.202 b/metadata/md5-cache/media-fonts/fira-sans-4.202
index 35a0e4d6d546..628238706922 100644
--- a/metadata/md5-cache/media-fonts/fira-sans-4.202
+++ b/metadata/md5-cache/media-fonts/fira-sans-4.202
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Default monospaced typeface for FirefoxOS, designed for legibility
 EAPI=7
 HOMEPAGE=https://mozilla.github.io/Fira
@@ -10,5 +10,5 @@ LICENSE=OFL-1.1
 REQUIRED_USE=|| ( otf ttf )
 SLOT=0
 SRC_URI=https://github.com/mozilla/Fira/archive/4.202.tar.gz -> Fira-4.202.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=907dd66d101bfee87e7fe1e75a5760e8
diff --git a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r2
index c896c56af0d6..7b53efe5ac71 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Adobe bitmap fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-adobe-100dpi
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=f4b63512f54afea00356192b93ee96a1
diff --git a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r2
index 29b5fa547815..133c26088a05 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Adobe bitmap fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-adobe-75dpi
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-75dpi-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=b1733e92c26e2f7040539abe9231a30d
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r2 b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r2
index 2d09d9774fba..d494940f0b09 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r2
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Adobe Utopia bitmap fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-adobe-utopia-100dpi
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=00be1888e00db0c3a428a7ba5971259a
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r2 b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r2
index 1e1815323c76..4154218fedcb 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r2
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Adobe Utopia bitmap fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-adobe-utopia-75dpi
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=00be1888e00db0c3a428a7ba5971259a
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r2 b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r2
index 42165f9fdc3a..7150fc7da057 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r2
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Adobe Utopia Type 1 fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-adobe-utopia-type1
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=cd982dcfc087376ab58cd88666b63482
diff --git a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r2
index 42f1fa28aa66..047560f2dbc1 100644
--- a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org arabic bitmap fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-arabic-misc
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-arabic-misc-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=ddbdffeed6d778a0874103a6dbdc80c6
diff --git a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r2
index 78107c0187e4..7737ffc6a9e0 100644
--- a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Bigelow & Holmes bitmap fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bh-100dpi
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-100dpi-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=bff721fe4512220701d7e0880eb53876
diff --git a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r2
index d3ef34bf0d40..46ee44a50bbb 100644
--- a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Bigelow & Holmes bitmap fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bh-75dpi
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-75dpi-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=bff721fe4512220701d7e0880eb53876
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r2
index 0921963fb2fd..dba02dd23046 100644
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Bigelow & Holmes Lucida bitmap fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bh-lucidatypewriter-100dpi
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=22a7f2f6ba951e7dcbaf3d0d2e00049d
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r2
index 970a1a14e306..1f9a3dc8ec4d 100644
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Bigelow & Holmes Lucida bitmap fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bh-lucidatypewriter-75dpi
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=22a7f2f6ba951e7dcbaf3d0d2e00049d
diff --git a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r2
index 0cd2032beb63..e1d307b666bd 100644
--- a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Bigelow & Holmes TrueType fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bh-ttf
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-ttf-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=6c675c22fe5e1c7abffd8214dccfe3c3
diff --git a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r2
index f6f7a7c106f3..308a572e89b6 100644
--- a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Bigelow & Holmes Type 1 fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bh-type1
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-type1-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=56e916801a8d4b18dd17955f0b0f663d
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r2
index fc6fcbebd015..78514fd85de1 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Bitstream bitmap fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bitstream-100dpi
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=37df4b49a83fcb7a293a2114c2f9e6ef
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r2
index c4c0889d4c33..3af346e1e67d 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Bitstream bitmap fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bitstream-75dpi
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=37df4b49a83fcb7a293a2114c2f9e6ef
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r2 b/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r2
index 6b5a7c98fda5..295ef1529859 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r2
+++ b/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=Bitstream Speedo fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bitstream-speedo
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-speedo-1.0.2.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=986bdc51fcf8b801a209f637b7577014
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r2
index 79998fd691e1..dcbd96e8a0e7 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Bitstream Type 1 fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bitstream-type1
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-type1-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=27a313451fd1b303a59127986503f72f
diff --git a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r2
index 15212bae30ff..9b9957fca634 100644
--- a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Cronyx cyrillic fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-cronyx-cyrillic
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=8edbb350cbb8e79dfbe351dc31e74c7c
diff --git a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r2
index 61663ec7a995..b3b83c360296 100644
--- a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org cursor font
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-cursor-misc
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-cursor-misc-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=50cce88ee41185cc249c1eb0e772ab8b
diff --git a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r2
index 6f9a50b871c8..fd6383917f86 100644
--- a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Daewoo fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-daewoo-misc
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-daewoo-misc-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=4eb39a517ac257c3afa04b483418a336
diff --git a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r2
index b025327e5c00..ca8dc243a0e5 100644
--- a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org DEC fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-dec-misc
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-dec-misc-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=e59e36199429e3d58b7ffbaa54460b16
diff --git a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r2
index 72c3700d94bb..3d344ac6a9e2 100644
--- a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org IBM Courier font
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-ibm-type1
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-ibm-type1-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=6df841c9460654b0589a3e298e3c738a
diff --git a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r2
index 2f460a55fe26..4306b368e2b3 100644
--- a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org the Institute of Software, Academia Sinica (chinese) fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-isas-misc
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-isas-misc-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=d86df31e703ea9e1da86a0cb0b11b30a
diff --git a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r2
index d9a9b3e31404..6d63e53ab240 100644
--- a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org JIS (japanese) fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-jis-misc
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-jis-misc-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=1d8b40f1dad45bc9a31e9c6139f20a7a
diff --git a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r2
index b8b5bd2126c7..db28fe027c8d 100644
--- a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org micro-misc font
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-micro-misc
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-micro-misc-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=108aa25ea97a69136832111fae7cb226
diff --git a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r2
index 00b32ee6310d..0e42da297888 100644
--- a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org misc-cyrillic fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-misc-cyrillic
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-cyrillic-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=944ff57e3054302aad105e0d082a2b48
diff --git a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.4 b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.4
index e53bcbf473da..d820b52157e6 100644
--- a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.4
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=Miscellaneous Ethiopic fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-misc-ethiopic
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-ethiopic-1.0.4.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=6f6feda853343639d3218aa0b376dcb1
diff --git a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r2
index b08078865801..6d4703bedbad 100644
--- a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Syriac fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-misc-meltho
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-meltho-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=fe581b1b5b72e61440070e6a099c378f
diff --git a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r2 b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r2
index 5ed210a4f1ba..fd82a7c3eb2a 100644
--- a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r2
+++ b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org miscellaneous fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-misc-misc
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-misc-1.1.2.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=506a98b97234a6e8abd8cab8fdda7d8d
diff --git a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r2
index 11d645ed0fda..c35596649927 100644
--- a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org ClearlyU fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-mutt-misc
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-mutt-misc-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=f8d8e748a070878af7fb4cecad5c79a0
diff --git a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r2 b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r2
index 1a07a1e2bc8f..a701b6879530 100644
--- a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r2
+++ b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Schumacher fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-schumacher-misc
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-schumacher-misc-1.1.2.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=0f6235b75633f1b35bd72ef66fbef340
diff --git a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r2 b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r2
index e23cac5c6724..2de1246bb997 100644
--- a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r2
+++ b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Screen cyrillic fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-screen-cyrillic
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-screen-cyrillic-1.0.4.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=2bd4001cb432cfb25f0daebcbeece7fb
diff --git a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r2
index 54eb9fc875d6..194e70fedadb 100644
--- a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Sony fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-sony-misc
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-sony-misc-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=9ead6d0740e26693cfbded9e141fb189
diff --git a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r2
index 6eb6a907a470..cf6e8d9f9723 100644
--- a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Sun fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-sun-misc
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-sun-misc-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=dfa99eb9f3421466a767b1b577986cf5
diff --git a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r2
index e1befff58091..9f6d4c986533 100644
--- a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org Winitzki cyrillic font
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-winitzki-cyrillic
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=6f042a1f8950eb3f65aa55d0ad4936e0
diff --git a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r2 b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r2
index b63bc1e5312c..fae6fe045ba2 100644
--- a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r2
+++ b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=X.Org XFree86 Type 1 font
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-xfree86-type1
@@ -12,5 +12,5 @@ PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-xfree86-type1-1.0.4.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	0667878c2b594871023dd1833d05996f	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
 _md5_=0494d545ea1fc9ec1092bd9918cc0aa0
diff --git a/metadata/md5-cache/media-fonts/fontawesome-5.14.0 b/metadata/md5-cache/media-fonts/fontawesome-5.14.0
index 51301032979a..aea574d727c7 100644
--- a/metadata/md5-cache/media-fonts/fontawesome-5.14.0
+++ b/metadata/md5-cache/media-fonts/fontawesome-5.14.0
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The iconic font
 EAPI=7
 HOMEPAGE=https://fontawesome.com
+INHERIT=font
 IUSE=+otf ttf X
 KEYWORDS=amd64 arm arm64 ~ppc64 x86
 LICENSE=CC-BY-4.0 OFL-1.1
 REQUIRED_USE=|| ( otf ttf )
 SLOT=0/5
 SRC_URI=https://github.com/FortAwesome/Font-Awesome/archive/5.14.0.tar.gz -> fontawesome-5.14.0.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=23b75846d14549b9348565d84c2c6fb4
diff --git a/metadata/md5-cache/media-fonts/fontawesome-5.15.1 b/metadata/md5-cache/media-fonts/fontawesome-5.15.1
index 02edd906107b..fc5c8e51f324 100644
--- a/metadata/md5-cache/media-fonts/fontawesome-5.15.1
+++ b/metadata/md5-cache/media-fonts/fontawesome-5.15.1
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The iconic font
 EAPI=7
 HOMEPAGE=https://fontawesome.com
+INHERIT=font
 IUSE=+otf ttf X
 KEYWORDS=amd64 arm arm64 ~ppc64 x86
 LICENSE=CC-BY-4.0 OFL-1.1
 REQUIRED_USE=|| ( otf ttf )
 SLOT=0/5
 SRC_URI=https://github.com/FortAwesome/Font-Awesome/archive/5.15.1.tar.gz -> fontawesome-5.15.1.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=23b75846d14549b9348565d84c2c6fb4
diff --git a/metadata/md5-cache/media-fonts/fontawesome-5.15.2 b/metadata/md5-cache/media-fonts/fontawesome-5.15.2
index 52d9b44d5986..4c9bbd9e2ca9 100644
--- a/metadata/md5-cache/media-fonts/fontawesome-5.15.2
+++ b/metadata/md5-cache/media-fonts/fontawesome-5.15.2
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The iconic font
 EAPI=7
 HOMEPAGE=https://fontawesome.com
+INHERIT=font
 IUSE=+otf ttf X
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=CC-BY-4.0 OFL-1.1
 REQUIRED_USE=|| ( otf ttf )
 SLOT=0/5
 SRC_URI=https://github.com/FortAwesome/Font-Awesome/archive/5.15.2.tar.gz -> fontawesome-5.15.2.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=e3cbad9b8d43bd8e08634af5dd5d162b
diff --git a/metadata/md5-cache/media-fonts/fontawesome-9999 b/metadata/md5-cache/media-fonts/fontawesome-9999
index 2587a609d739..d2d8e2b452cc 100644
--- a/metadata/md5-cache/media-fonts/fontawesome-9999
+++ b/metadata/md5-cache/media-fonts/fontawesome-9999
@@ -1,13 +1,13 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The iconic font
 EAPI=7
 HOMEPAGE=https://fontawesome.com
+INHERIT=font git-r3
 IUSE=+otf ttf X
 LICENSE=CC-BY-4.0 OFL-1.1
 PROPERTIES=live
 REQUIRED_USE=|| ( otf ttf )
 SLOT=0/5
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=font	0667878c2b594871023dd1833d05996f	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=e0893ade2de0674867a58e8874028e69
diff --git a/metadata/md5-cache/media-fonts/free-bangla-font-0.2 b/metadata/md5-cache/media-fonts/free-bangla-font-0.2
index 240f5f383522..c79634dea3da 100644
--- a/metadata/md5-cache/media-fonts/free-bangla-font-0.2
+++ b/metadata/md5-cache/media-fonts/free-bangla-font-0.2
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Unicode compliant Open Type Bangla fonts
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/freebangfont/index.html
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc s390 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/freebangfont/Akaash-0.8.5.tar.gz https://savannah.nongnu.org/download/freebangfont/Ani.tar.gz https://savannah.nongnu.org/download/freebangfont/Likhan-0.5.tar.gz https://savannah.nongnu.org/download/freebangfont/MuktiNarrow-0.94.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=d05ace64033c56b09019f0cfd4bff680
diff --git a/metadata/md5-cache/media-fonts/freefont-20120503 b/metadata/md5-cache/media-fonts/freefont-20120503
index ad2a586575dd..0b5b0bed1cfc 100644
--- a/metadata/md5-cache/media-fonts/freefont-20120503
+++ b/metadata/md5-cache/media-fonts/freefont-20120503
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=OpenType and TrueType Unicode fonts from the Free UCS Outline Fonts Project
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/freefont/
@@ -11,5 +10,5 @@ LICENSE=GPL-3
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://gnu/freefont/freefont-ttf-20120503.zip mirror://gnu/freefont/freefont-otf-20120503.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=df82753e9e81f06c03bbec302bdafd9a
diff --git a/metadata/md5-cache/media-fonts/freefonts-0.10-r4 b/metadata/md5-cache/media-fonts/freefonts-0.10-r4
index e0e0f35c420e..90b5bf8132e8 100644
--- a/metadata/md5-cache/media-fonts/freefonts-0.10-r4
+++ b/metadata/md5-cache/media-fonts/freefonts-0.10-r4
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=A Collection of Free Type1 Fonts
 EAPI=7
 HOMEPAGE=http://www.gimp.org
+INHERIT=font
 IUSE=X X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris
 LICENSE=freedist free-noncomm all-rights-reserved
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=mirror://gimp/fonts/freefonts-0.10.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=13ffb97375611f5ec8a51b6cdb3a6c42
diff --git a/metadata/md5-cache/media-fonts/fs-fonts-0.1_alpha3 b/metadata/md5-cache/media-fonts/fs-fonts-0.1_alpha3
index 2ca9fcb38e0b..a06d4677363a 100644
--- a/metadata/md5-cache/media-fonts/fs-fonts-0.1_alpha3
+++ b/metadata/md5-cache/media-fonts/fs-fonts-0.1_alpha3
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Japanese TrueType fonts designed for screen and print
 EAPI=7
 HOMEPAGE=http://x-tt.sourceforge.jp/fs_fonts/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/x-tt/7862/fs-fonts-0.1test3.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=e28ee71fcaeab78f372a9dfb089c2555
diff --git a/metadata/md5-cache/media-fonts/gidole-2.0.2 b/metadata/md5-cache/media-fonts/gidole-2.0.2
index 74173401d338..75a9d5b78494 100644
--- a/metadata/md5-cache/media-fonts/gidole-2.0.2
+++ b/metadata/md5-cache/media-fonts/gidole-2.0.2
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Open source modern DIN fonts
 EAPI=7
 HOMEPAGE=http://gidole.github.io/
@@ -10,5 +9,5 @@ KEYWORDS=amd64 arm x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/gidole-2.0.2.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=f06f910ff7f66f5abe71b91ace0d3b5c
diff --git a/metadata/md5-cache/media-fonts/glass-tty-vt220-001.3-r2 b/metadata/md5-cache/media-fonts/glass-tty-vt220-001.3-r2
index 67d971df4952..cd387b8c9628 100644
--- a/metadata/md5-cache/media-fonts/glass-tty-vt220-001.3-r2
+++ b/metadata/md5-cache/media-fonts/glass-tty-vt220-001.3-r2
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile configure install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Hacking with Style: TrueType VT220 Font
 EAPI=7
 HOMEPAGE=http://sensi.org/~svo/glasstty/ https://github.com/svofski/glasstty
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=Unlicense
 SLOT=0
 SRC_URI=https://github.com/svofski/glasstty/archive/8d5bcafe971ee94df4aa20317f197d407df672e9.tar.gz -> glass-tty-vt220-001.3.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=4d07549e4bba7e7593e9cdcfd680e4db
diff --git a/metadata/md5-cache/media-fonts/hack-3.003 b/metadata/md5-cache/media-fonts/hack-3.003
index 598e15346bf3..7f917f7b947d 100644
--- a/metadata/md5-cache/media-fonts/hack-3.003
+++ b/metadata/md5-cache/media-fonts/hack-3.003
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Typeface designed for source code
 EAPI=7
 HOMEPAGE=https://github.com/source-foundry/Hack
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/source-foundry/Hack/releases/download/v3.003/Hack-v3.003-ttf.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=3c4c48ea08d949fcc612639f1aae2d65
diff --git a/metadata/md5-cache/media-fonts/hermit-1.21 b/metadata/md5-cache/media-fonts/hermit-1.21
index c199240d68c6..7559fb7c7b6c 100644
--- a/metadata/md5-cache/media-fonts/hermit-1.21
+++ b/metadata/md5-cache/media-fonts/hermit-1.21
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Monospace font designed to be clear, pragmatic and very readable
 EAPI=7
 HOMEPAGE=https://pcaro.es/p/hermit/
@@ -9,5 +9,5 @@ KEYWORDS=~amd64
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://pcaro.es/d/otf-hermit-1.21.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=0a21e7c00511860e1f18e506e84c473a
diff --git a/metadata/md5-cache/media-fonts/heuristica-1.0.2 b/metadata/md5-cache/media-fonts/heuristica-1.0.2
index 82c725734c73..5ffbba4fcc7e 100644
--- a/metadata/md5-cache/media-fonts/heuristica-1.0.2
+++ b/metadata/md5-cache/media-fonts/heuristica-1.0.2
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Font based on Adobe Utopia
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/heuristica/
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/heuristica/heuristica-ttf-1.0.2.tar.xz mirror://sourceforge/heuristica/heuristica-otf-1.0.2.tar.xz mirror://sourceforge/heuristica/heuristica-pfb-1.0.2.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=66bba944740857c0c29c764131e2db2a
diff --git a/metadata/md5-cache/media-fonts/hunkyfonts-0.3.1 b/metadata/md5-cache/media-fonts/hunkyfonts-0.3.1
index 636ba5b3ee57..3284d8439f45 100644
--- a/metadata/md5-cache/media-fonts/hunkyfonts-0.3.1
+++ b/metadata/md5-cache/media-fonts/hunkyfonts-0.3.1
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Free TrueType fonts based on Bitstream's Vera fonts with additional letters
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/hunkyfonts/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc s390 sparc x86
 LICENSE=BitstreamVera public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/hunkyfonts/hunkyfonts-0.3.1.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=3fd1ec8c8d4881a0b183fec05059dcef
diff --git a/metadata/md5-cache/media-fonts/ibm-plex-5.1.3 b/metadata/md5-cache/media-fonts/ibm-plex-5.1.3
index dc89cf300f80..55ac67749356 100644
--- a/metadata/md5-cache/media-fonts/ibm-plex-5.1.3
+++ b/metadata/md5-cache/media-fonts/ibm-plex-5.1.3
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The package of IBM's typeface
 EAPI=7
 HOMEPAGE=https://github.com/IBM/plex
+INHERIT=font
 IUSE=otf +ttf X
 KEYWORDS=amd64 x86
 LICENSE=OFL-1.1
 REQUIRED_USE=^^ ( otf ttf )
 SLOT=0
 SRC_URI=https://github.com/IBM/plex/archive/v5.1.3.tar.gz -> ibm-plex-5.1.3.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=95fb2b8af77e968119a90d262c208e97
diff --git a/metadata/md5-cache/media-fonts/inconsolata-20140821 b/metadata/md5-cache/media-fonts/inconsolata-20140821
index dd2309c938b8..11b5eaec2211 100644
--- a/metadata/md5-cache/media-fonts/inconsolata-20140821
+++ b/metadata/md5-cache/media-fonts/inconsolata-20140821
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Sans-serif monotype font for code listings
 EAPI=7
 HOMEPAGE=https://fonts.google.com/specimen/Inconsolata?preview.text_type=custom
@@ -10,5 +10,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/inconsolata-20140821.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=8708ce3fa08d257fe92ce32fa0dc3133
diff --git a/metadata/md5-cache/media-fonts/inconsolata-hellenic-1.19-r1 b/metadata/md5-cache/media-fonts/inconsolata-hellenic-1.19-r1
index ff094972c593..a622a16eee1b 100644
--- a/metadata/md5-cache/media-fonts/inconsolata-hellenic-1.19-r1
+++ b/metadata/md5-cache/media-fonts/inconsolata-hellenic-1.19-r1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Hellenisation of the wonderful, monospace, open/free font Inconsolata
 EAPI=7
 HOMEPAGE=https://www.cosmix.org/software/
@@ -10,5 +9,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://www.cosmix.org/software/files/InconsolataHellenic.zip -> inconsolata-hellenic-1.19.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=6406f2dad5ae8dad903081010cd66afe
diff --git a/metadata/md5-cache/media-fonts/inconsolata-lgc-1.3.0 b/metadata/md5-cache/media-fonts/inconsolata-lgc-1.3.0
index 53b4ed609aba..8e5449e058ba 100644
--- a/metadata/md5-cache/media-fonts/inconsolata-lgc-1.3.0
+++ b/metadata/md5-cache/media-fonts/inconsolata-lgc-1.3.0
@@ -1,13 +1,13 @@
-BDEPEND=media-gfx/fontforge
+BDEPEND=media-gfx/fontforge X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Modified version of Inconsolata Hellenic adding the Cyrillic alphabet
 EAPI=7
 HOMEPAGE=https://github.com/MihailJP/Inconsolata-LGC
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/MihailJP/Inconsolata-LGC/archive/LGC-1.3.0.tar.gz -> inconsolata-lgc-1.3.0.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=09973217fded21e0d5472960c2d0ee6b
diff --git a/metadata/md5-cache/media-fonts/intlfonts-1.2.1-r1 b/metadata/md5-cache/media-fonts/intlfonts-1.2.1-r1
index f27815dd52f2..761441678f26 100644
--- a/metadata/md5-cache/media-fonts/intlfonts-1.2.1-r1
+++ b/metadata/md5-cache/media-fonts/intlfonts-1.2.1-r1
@@ -1,12 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=x11-apps/bdftopcf >=x11-apps/mkfontscale-1.2.0 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=x11-apps/bdftopcf >=x11-apps/mkfontscale-1.2.0
 DESCRIPTION=International X11 fixed fonts
 EAPI=7
 HOMEPAGE=https://www.gnu.org/directory/intlfonts.html
+INHERIT=font
 IUSE=bdf non-free X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=public-domain HPND non-free? ( free-noncomm )
 SLOT=0
 SRC_URI=mirror://gnu/intlfonts/intlfonts-1.2.1.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=2ae90c8746296636aa75e7645f570ea3
diff --git a/metadata/md5-cache/media-fonts/intlfonts-1.4.1 b/metadata/md5-cache/media-fonts/intlfonts-1.4.1
index 6d50f1764db3..deae93a87edc 100644
--- a/metadata/md5-cache/media-fonts/intlfonts-1.4.1
+++ b/metadata/md5-cache/media-fonts/intlfonts-1.4.1
@@ -1,6 +1,5 @@
-BDEPEND=x11-apps/bdftopcf >=x11-apps/mkfontscale-1.2.0
+BDEPEND=x11-apps/bdftopcf >=x11-apps/mkfontscale-1.2.0 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=configure install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=International X11 fixed fonts
 EAPI=7
 HOMEPAGE=https://www.gnu.org/directory/intlfonts.html
@@ -10,5 +9,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=public-domain HPND GPL-3+-with-font-exception
 SLOT=0
 SRC_URI=mirror://gnu/intlfonts/intlfonts-1.4.1.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=312f23be50b3f048209c0d596b300ecc
diff --git a/metadata/md5-cache/media-fonts/iosevka-1.14.1 b/metadata/md5-cache/media-fonts/iosevka-1.14.1
index ef2ecce00fe1..c491443bf734 100644
--- a/metadata/md5-cache/media-fonts/iosevka-1.14.1
+++ b/metadata/md5-cache/media-fonts/iosevka-1.14.1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Slender typeface for code, from code
 EAPI=7
 HOMEPAGE=https://typeof.net/Iosevka/
@@ -10,5 +9,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/be5invis/iosevka/releases/download/v1.14.1/01-iosevka-1.14.1.zip https://github.com/be5invis/iosevka/releases/download/v1.14.1/02-iosevka-term-1.14.1.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=8f2138243dc7d2a8c3ac6efb3591cf96
diff --git a/metadata/md5-cache/media-fonts/ipaex-002.01 b/metadata/md5-cache/media-fonts/ipaex-002.01
index 0fa60f6bd9ff..343bb968202d 100644
--- a/metadata/md5-cache/media-fonts/ipaex-002.01
+++ b/metadata/md5-cache/media-fonts/ipaex-002.01
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Japanese IPA extended TrueType fonts
 EAPI=7
 HOMEPAGE=https://ipafonts.osdn.jp/
@@ -11,5 +10,5 @@ LICENSE=IPAfont
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=https://osdn.mirror.liquidtelecom.com/ipafonts/57330/IPAexfont00201.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=04f51f09dd7575c63215503239b01b16
diff --git a/metadata/md5-cache/media-fonts/ipamonafont-1.0.8 b/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
index 151c7a3b04a7..64500de66edd 100644
--- a/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
+++ b/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Hacked version of IPA fonts, which is suitable for browsing 2ch
 EAPI=7
 HOMEPAGE=https://web.archive.org/web/20190326123924/http://www.geocities.jp/ipa_mona/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 s390 sparc x86
 LICENSE=grass-ipafonts mplus-fonts public-domain
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://freebsd.sin.openmirrors.asia/pub/FreeBSD/ports/local-distfiles/hrs/opfc-ModuleHP-1.1.1_withIPAMonaFonts-1.0.8.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=7436e7593c1d26224f87cdf6f292b90e
diff --git a/metadata/md5-cache/media-fonts/ja-ipafonts-003.03 b/metadata/md5-cache/media-fonts/ja-ipafonts-003.03
index 5f7437bc0040..b287ea645bc2 100644
--- a/metadata/md5-cache/media-fonts/ja-ipafonts-003.03
+++ b/metadata/md5-cache/media-fonts/ja-ipafonts-003.03
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=TrueType fonts developed by Japanese Information-technology Promotion Agency
 EAPI=7
 HOMEPAGE=http://ipafont.ipa.go.jp/
@@ -11,5 +10,5 @@ LICENSE=IPAfont
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://dl.ipafont.ipa.go.jp/IPAfont/IPAfont00303.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=73cf2c1465e8669eb4b3e39952ea0d34
diff --git a/metadata/md5-cache/media-fonts/jetbrains-mono-2.225 b/metadata/md5-cache/media-fonts/jetbrains-mono-2.225
index 6fe109fdfa90..42139738fde9 100644
--- a/metadata/md5-cache/media-fonts/jetbrains-mono-2.225
+++ b/metadata/md5-cache/media-fonts/jetbrains-mono-2.225
@@ -1,13 +1,13 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=A free and open-source typeface for developers
 EAPI=7
 HOMEPAGE=https://www.jetbrains.com/lp/mono/
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/JetBrains/JetBrainsMono/releases/download/v2.225/JetBrainsMono-2.225.zip -> jetbrains-mono-2.225.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=8352be7d6f9c736970d50955be84e89e
diff --git a/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r2 b/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r2
index b969945ac53e..6aee3ca52bc6 100644
--- a/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r2
+++ b/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r2
@@ -1,5 +1,6 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=X? ( media-gfx/ebdftopcf )
 DESCRIPTION=Japanese fixed fonts that cover JIS0213 charset
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -10,5 +11,5 @@ LICENSE=public-domain
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/jiskan16-2004-1.bdf.gz mirror://gentoo/jiskan16-2000-1.bdf.gz mirror://gentoo/jiskan16-2000-2.bdf.gz mirror://gentoo/K14-2004-1.bdf.gz mirror://gentoo/K14-2000-1.bdf.gz mirror://gentoo/K14-2000-2.bdf.gz mirror://gentoo/K12-1.bdf.gz mirror://gentoo/K12-2.bdf.gz mirror://gentoo/A14.bdf.gz mirror://gentoo/A12.bdf.gz mirror://gentoo/jiskan24-2000-1.bdf.gz mirror://gentoo/jiskan24-2000-2.bdf.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
+_eclasses_=font	0667878c2b594871023dd1833d05996f	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
 _md5_=da69d5e35f88505c1e545ea734268066
diff --git a/metadata/md5-cache/media-fonts/jomolhari-0.003c b/metadata/md5-cache/media-fonts/jomolhari-0.003c
index a32592cc2fce..fc16a9902213 100644
--- a/metadata/md5-cache/media-fonts/jomolhari-0.003c
+++ b/metadata/md5-cache/media-fonts/jomolhari-0.003c
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Bhutanese style dbu-can font for Tibetan/Dzongkha text named after Mt Jomolhari
 EAPI=7
 HOMEPAGE=http://www.library.gov.bt/IT/fonts.html
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL
 SLOT=0
 SRC_URI=mirror://nongnu/free-tibetan/jomolhari/jomolhari-alpha3c.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=c2618a62b4aed7fdaf2e5da82fc1d1ab
diff --git a/metadata/md5-cache/media-fonts/jsmath-1.0 b/metadata/md5-cache/media-fonts/jsmath-1.0
index 6f10980434f0..244dc4a12243 100644
--- a/metadata/md5-cache/media-fonts/jsmath-1.0
+++ b/metadata/md5-cache/media-fonts/jsmath-1.0
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Raster fonts for jsmath
 EAPI=7
 HOMEPAGE=http://www.math.union.edu/~dpvc/jsMath/
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 ppc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://www.math.union.edu/~dpvc/jsMath/download/TeX-fonts-linux.tgz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=8c2b318b6d7d8efa4cbb978530538ee1
diff --git a/metadata/md5-cache/media-fonts/jsmath-extra-dark-1.0 b/metadata/md5-cache/media-fonts/jsmath-extra-dark-1.0
index 3c4cae24333d..a3b2feb9f679 100644
--- a/metadata/md5-cache/media-fonts/jsmath-extra-dark-1.0
+++ b/metadata/md5-cache/media-fonts/jsmath-extra-dark-1.0
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Extra raster fonts for jsmath, dark version
 EAPI=7
 HOMEPAGE=http://www.math.union.edu/~dpvc/jsMath/download/extra-fonts/
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=media-fonts/jsmath !media-fonts/jsmath-extra-light
 SLOT=0
 SRC_URI=mirror://gentoo/jsmath-extra-dark-1.0.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=8222426ac7dee483e2431ee364c6a726
diff --git a/metadata/md5-cache/media-fonts/kacst-fonts-2.01 b/metadata/md5-cache/media-fonts/kacst-fonts-2.01
index 3b4220fa8421..2e7b2201f3fb 100644
--- a/metadata/md5-cache/media-fonts/kacst-fonts-2.01
+++ b/metadata/md5-cache/media-fonts/kacst-fonts-2.01
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=KACST Arabic TrueType Fonts
 EAPI=7
 HOMEPAGE=https://www.arabeyes.org/Khotot https://gitlab.com/arabeyes-art/khotot
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~s390 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/arabeyes/kacst_fonts_2.01.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=9e7711e460513c3d98c18d9afd66a23c
diff --git a/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002 b/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002
index 3ebe5d1a736b..2d0e09cfe800 100644
--- a/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002
+++ b/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Font for viewing stroke order diagrams for kanji, kana and other characters
 EAPI=7
 HOMEPAGE=https://sites.google.com/site/nihilistorguk/
@@ -11,5 +10,5 @@ LICENSE=BSD
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v4.002.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=d38fdcdb85854db4ae25b68572127ec2
diff --git a/metadata/md5-cache/media-fonts/khmer-5.0-r1 b/metadata/md5-cache/media-fonts/khmer-5.0-r1
index 851170ebb5f7..c9f4bf1225f9 100644
--- a/metadata/md5-cache/media-fonts/khmer-5.0-r1
+++ b/metadata/md5-cache/media-fonts/khmer-5.0-r1
@@ -1,13 +1,13 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Fonts for the Khmer language of Cambodia
 EAPI=7
 HOMEPAGE=http://www.khmeros.info/drupal/?q=en/download/fonts
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/khmer/All_KhmerOS_5.0.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=a6feabe281168e7d61f26705a81387d3
diff --git a/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3 b/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3
index c017c106d9fc..27575d51888b 100644
--- a/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3
+++ b/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Kochi Japanese TrueType fonts with Wadalab Fonts
 EAPI=7
 HOMEPAGE=http://efont.sourceforge.jp/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=free-noncomm
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/efont/5411/kochi-substitute-20030809.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=f2e79b63cdfeacd71fcfbd61679db7a7
diff --git a/metadata/md5-cache/media-fonts/koruri-20180915 b/metadata/md5-cache/media-fonts/koruri-20180915
index 2987c3718e42..0e0fb60dc17b 100644
--- a/metadata/md5-cache/media-fonts/koruri-20180915
+++ b/metadata/md5-cache/media-fonts/koruri-20180915
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Japanese TrueType font based on M+ outline fonts and Open Sans
 EAPI=7
 HOMEPAGE=https://koruri.github.io/
@@ -10,5 +10,5 @@ LICENSE=mplus-fonts Apache-2.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/Koruri/Koruri/releases/download/Koruri-20180915/Koruri-20180915.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=c32672445843add4f7a5dbda4cc25770
diff --git a/metadata/md5-cache/media-fonts/lfpfonts-fix-0.83-r2 b/metadata/md5-cache/media-fonts/lfpfonts-fix-0.83-r2
index 16207bc0ce76..ca418669a79d 100644
--- a/metadata/md5-cache/media-fonts/lfpfonts-fix-0.83-r2
+++ b/metadata/md5-cache/media-fonts/lfpfonts-fix-0.83-r2
@@ -1,13 +1,15 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=X? ( media-gfx/ebdftopcf )
 DESCRIPTION=Linux Font Project fixed-width fonts
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xfonts/
+INHERIT=font font-ebdftopcf
 IUSE=X X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc s390 sparc x86
 LICENSE=public-domain
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/xfonts/lfpfonts-fix-src-0.83.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
+_eclasses_=font	0667878c2b594871023dd1833d05996f	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
 _md5_=53aeea740160166cfc3ca21129e763f9
diff --git a/metadata/md5-cache/media-fonts/lfpfonts-var-0.84 b/metadata/md5-cache/media-fonts/lfpfonts-var-0.84
index f7befeb596b6..fb152efd97a9 100644
--- a/metadata/md5-cache/media-fonts/lfpfonts-var-0.84
+++ b/metadata/md5-cache/media-fonts/lfpfonts-var-0.84
@@ -1,13 +1,15 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=X? ( media-gfx/ebdftopcf )
 DESCRIPTION=Linux Font Project variable-width fonts
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xfonts/
+INHERIT=font font-ebdftopcf
 IUSE=X X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc s390 sparc x86
 LICENSE=public-domain
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/xfonts/lfpfonts-var-src-0.84.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
+_eclasses_=font	0667878c2b594871023dd1833d05996f	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
 _md5_=603d11ceaad39cda08bd7fe76bbcca4f
diff --git a/metadata/md5-cache/media-fonts/liberation-fonts-2.1.2 b/metadata/md5-cache/media-fonts/liberation-fonts-2.1.2
index e554d3288019..238be051da1d 100644
--- a/metadata/md5-cache/media-fonts/liberation-fonts-2.1.2
+++ b/metadata/md5-cache/media-fonts/liberation-fonts-2.1.2
@@ -1,13 +1,13 @@
-BDEPEND=fontforge? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) media-gfx/fontforge || ( ( dev-lang/python:3.9 dev-python/fonttools[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/fonttools[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/fonttools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
+BDEPEND=fontforge? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) media-gfx/fontforge || ( ( dev-lang/python:3.9 dev-python/fonttools[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/fonttools[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/fonttools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat
 EAPI=7
 HOMEPAGE=https://github.com/liberationfonts/liberation-fonts
+INHERIT=font python-any-r1
 IUSE=fontforge X X
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/5722232/liberation-fonts-2.1.2.tar.gz ) !fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/5722233/liberation-fonts-ttf-2.1.2.tar.gz )
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=font	0667878c2b594871023dd1833d05996f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=f84d2a4e36436efbc2d670083ee37165
diff --git a/metadata/md5-cache/media-fonts/liberation-fonts-2.1.3 b/metadata/md5-cache/media-fonts/liberation-fonts-2.1.3
index 4f5aa2f38a25..47a6051b5343 100644
--- a/metadata/md5-cache/media-fonts/liberation-fonts-2.1.3
+++ b/metadata/md5-cache/media-fonts/liberation-fonts-2.1.3
@@ -1,13 +1,13 @@
-BDEPEND=fontforge? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) media-gfx/fontforge || ( ( dev-lang/python:3.9 dev-python/fonttools[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/fonttools[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/fonttools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
+BDEPEND=fontforge? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) media-gfx/fontforge || ( ( dev-lang/python:3.9 dev-python/fonttools[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/fonttools[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/fonttools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat
 EAPI=7
 HOMEPAGE=https://github.com/liberationfonts/liberation-fonts
+INHERIT=font python-any-r1
 IUSE=fontforge X X
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060974/liberation-fonts-2.1.3.tar.gz ) !fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060976/liberation-fonts-ttf-2.1.3.tar.gz )
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=font	0667878c2b594871023dd1833d05996f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=e6bbbbd8c5f79b3f32f0fa06b9b5e163
diff --git a/metadata/md5-cache/media-fonts/libertine-5.3.0.20120702-r3 b/metadata/md5-cache/media-fonts/libertine-5.3.0.20120702-r3
index 0257216f7641..c97866771647 100644
--- a/metadata/md5-cache/media-fonts/libertine-5.3.0.20120702-r3
+++ b/metadata/md5-cache/media-fonts/libertine-5.3.0.20120702-r3
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Fonts from the Linux Libertine Open Fonts Project
 EAPI=7
 HOMEPAGE=http://libertine-fonts.org/
@@ -10,5 +10,5 @@ LICENSE=|| ( GPL-2-with-font-exception OFL-1.1 )
 RDEPEND=!<x11-libs/pango-1.20.4
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxlibertine/LinLibertineOTF_5.3.0_2012_07_02.tgz mirror://sourceforge/linuxlibertine/LinLibertineTTF_5.3.0_2012_07_02.tgz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=0c1939cffd2665912e77c7f75e7e3b32
diff --git a/metadata/md5-cache/media-fonts/lklug-0.6-r1 b/metadata/md5-cache/media-fonts/lklug-0.6-r1
index 645b8e588a9e..540d30c5e618 100644
--- a/metadata/md5-cache/media-fonts/lklug-0.6-r1
+++ b/metadata/md5-cache/media-fonts/lklug-0.6-r1
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Unicode Sinhala font
 EAPI=7
 HOMEPAGE=http://sinhala.sourceforge.net/
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://sinhala.sourceforge.net/files/ttf-sinhala-lklug-0.6.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=07016dff396efd487e709a11b2b77d15
diff --git a/metadata/md5-cache/media-fonts/lohit-assamese-2.91.5 b/metadata/md5-cache/media-fonts/lohit-assamese-2.91.5
index dead3cb18bd3..8134a16b5bbd 100644
--- a/metadata/md5-cache/media-fonts/lohit-assamese-2.91.5
+++ b/metadata/md5-cache/media-fonts/lohit-assamese-2.91.5
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Assamese font
 EAPI=7
 HOMEPAGE=https://pagure.io/lohit
@@ -11,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-assamese-ttf-2.91.5.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=48bde2dac5e24bbf5f389776876953ea
diff --git a/metadata/md5-cache/media-fonts/lohit-bengali-2.91.5 b/metadata/md5-cache/media-fonts/lohit-bengali-2.91.5
index 7dde06fba1fa..128460168f3c 100644
--- a/metadata/md5-cache/media-fonts/lohit-bengali-2.91.5
+++ b/metadata/md5-cache/media-fonts/lohit-bengali-2.91.5
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Bengali font
 EAPI=7
 HOMEPAGE=https://pagure.io/lohit
@@ -11,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-bengali-ttf-2.91.5.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=24e584a43af01963062f6cbf2daa59ed
diff --git a/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.4 b/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.4
index 8fc8ade5234e..89e025b60284 100644
--- a/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.4
+++ b/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.4
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Devanagari font
 EAPI=7
 HOMEPAGE=https://pagure.io/lohit
@@ -11,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-devanagari-ttf-2.95.4.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=55a9849cbe704308291be8a3c20db6a6
diff --git a/metadata/md5-cache/media-fonts/lohit-gujarati-2.92.4 b/metadata/md5-cache/media-fonts/lohit-gujarati-2.92.4
index f617b9911b4c..e8859b9c63b7 100644
--- a/metadata/md5-cache/media-fonts/lohit-gujarati-2.92.4
+++ b/metadata/md5-cache/media-fonts/lohit-gujarati-2.92.4
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Gujarati font
 EAPI=7
 HOMEPAGE=https://pagure.io/lohit
@@ -11,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-gujarati-ttf-2.92.4.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=1cdd176938987b9dfb157262c6cf165d
diff --git a/metadata/md5-cache/media-fonts/lohit-gurmukhi-2.91.2 b/metadata/md5-cache/media-fonts/lohit-gurmukhi-2.91.2
index 6f4a8f71f7f4..0945f6e03bb1 100644
--- a/metadata/md5-cache/media-fonts/lohit-gurmukhi-2.91.2
+++ b/metadata/md5-cache/media-fonts/lohit-gurmukhi-2.91.2
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Gurmukhi font
 EAPI=7
 HOMEPAGE=https://pagure.io/lohit
@@ -11,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-gurmukhi-ttf-2.91.2.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=8edb6a7a3b2c652e305b003dd2a0de62
diff --git a/metadata/md5-cache/media-fonts/lohit-kannada-2.5.4 b/metadata/md5-cache/media-fonts/lohit-kannada-2.5.4
index 6d20c4007be2..9d4d30884a7b 100644
--- a/metadata/md5-cache/media-fonts/lohit-kannada-2.5.4
+++ b/metadata/md5-cache/media-fonts/lohit-kannada-2.5.4
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Kannada font
 EAPI=7
 HOMEPAGE=https://pagure.io/lohit
@@ -11,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-kannada-ttf-2.5.4.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=6932a76d12b0752c1615a1b58ad059a3
diff --git a/metadata/md5-cache/media-fonts/lohit-malayalam-2.92.2 b/metadata/md5-cache/media-fonts/lohit-malayalam-2.92.2
index ed7db569bbde..081d7496d9e5 100644
--- a/metadata/md5-cache/media-fonts/lohit-malayalam-2.92.2
+++ b/metadata/md5-cache/media-fonts/lohit-malayalam-2.92.2
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Malayalam font
 EAPI=7
 HOMEPAGE=https://pagure.io/lohit
@@ -11,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-malayalam-ttf-2.92.2.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=e4047d5c15e942811b3c20d1030df17b
diff --git a/metadata/md5-cache/media-fonts/lohit-marathi-2.94.2 b/metadata/md5-cache/media-fonts/lohit-marathi-2.94.2
index 38d5c1f4ccc8..72e0d55ff392 100644
--- a/metadata/md5-cache/media-fonts/lohit-marathi-2.94.2
+++ b/metadata/md5-cache/media-fonts/lohit-marathi-2.94.2
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Marathi font
 EAPI=7
 HOMEPAGE=https://pagure.io/lohit
@@ -11,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-marathi-ttf-2.94.2.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=e22c0f80fd8cde23708a86b52c524798
diff --git a/metadata/md5-cache/media-fonts/lohit-nepali-2.94.2 b/metadata/md5-cache/media-fonts/lohit-nepali-2.94.2
index 19b8fc90329f..0f044cb69a9b 100644
--- a/metadata/md5-cache/media-fonts/lohit-nepali-2.94.2
+++ b/metadata/md5-cache/media-fonts/lohit-nepali-2.94.2
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Nepali font
 EAPI=7
 HOMEPAGE=https://pagure.io/lohit
@@ -11,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-nepali-ttf-2.94.2.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=c832b89064d1df05c8a38a5fab417f7f
diff --git a/metadata/md5-cache/media-fonts/lohit-odia-2.91.2 b/metadata/md5-cache/media-fonts/lohit-odia-2.91.2
index 04fc19979bfa..23e510b00842 100644
--- a/metadata/md5-cache/media-fonts/lohit-odia-2.91.2
+++ b/metadata/md5-cache/media-fonts/lohit-odia-2.91.2
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Odia font
 EAPI=7
 HOMEPAGE=https://pagure.io/lohit
@@ -11,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-odia-ttf-2.91.2.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=b9a8d8da4fedee8506f00406b8a42038
diff --git a/metadata/md5-cache/media-fonts/lohit-tamil-2.91.3 b/metadata/md5-cache/media-fonts/lohit-tamil-2.91.3
index 38467ac20e99..8fa7f2864d18 100644
--- a/metadata/md5-cache/media-fonts/lohit-tamil-2.91.3
+++ b/metadata/md5-cache/media-fonts/lohit-tamil-2.91.3
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Tamil font
 EAPI=7
 HOMEPAGE=https://pagure.io/lohit
@@ -11,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-tamil-ttf-2.91.3.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=3385365d5be8a1dbc615e109c6b7c1ca
diff --git a/metadata/md5-cache/media-fonts/lohit-tamil-classical-2.5.4 b/metadata/md5-cache/media-fonts/lohit-tamil-classical-2.5.4
index 926a59429612..87b042e5e475 100644
--- a/metadata/md5-cache/media-fonts/lohit-tamil-classical-2.5.4
+++ b/metadata/md5-cache/media-fonts/lohit-tamil-classical-2.5.4
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Tamil Classical font
 EAPI=7
 HOMEPAGE=https://pagure.io/lohit
@@ -11,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-tamil-classical-ttf-2.5.4.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=b672464a85d8c8f1a9267ee088252909
diff --git a/metadata/md5-cache/media-fonts/lohit-telugu-2.5.5 b/metadata/md5-cache/media-fonts/lohit-telugu-2.5.5
index d67341816502..391218e6c589 100644
--- a/metadata/md5-cache/media-fonts/lohit-telugu-2.5.5
+++ b/metadata/md5-cache/media-fonts/lohit-telugu-2.5.5
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Telugu font
 EAPI=7
 HOMEPAGE=https://pagure.io/lohit
@@ -11,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-telugu-ttf-2.5.5.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=2548e761bc9bd0234570af7a23bf44ac
diff --git a/metadata/md5-cache/media-fonts/mgopen-1.1 b/metadata/md5-cache/media-fonts/mgopen-1.1
index bea726428941..b9fdfec985e9 100644
--- a/metadata/md5-cache/media-fonts/mgopen-1.1
+++ b/metadata/md5-cache/media-fonts/mgopen-1.1
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Magenta MgOpen typeface collection for Modern Greek
 EAPI=7
 HOMEPAGE=http://www.ellak.gr/pub/fonts/mgopen/index.en.html
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 ppc x86
 LICENSE=MagentaMgOpen
 SLOT=0
 SRC_URI=mirror://gentoo/mgopen-1.1.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=b44dd363bc0bfaeedccf090e703a2bce
diff --git a/metadata/md5-cache/media-fonts/mikachan-font-otf-9.1-r1 b/metadata/md5-cache/media-fonts/mikachan-font-otf-9.1-r1
index f4f474866e5c..095826c10c1f 100644
--- a/metadata/md5-cache/media-fonts/mikachan-font-otf-9.1-r1
+++ b/metadata/md5-cache/media-fonts/mikachan-font-otf-9.1-r1
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Mikachan Japanese TrueType Collection fonts
 EAPI=7
 HOMEPAGE=http://mikachan-font.com/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=free-noncomm
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://gentoo/mikachan-font-otf-9.1.tar.bz2 https://dev.gentoo.org/~flameeyes/dist/mikachan-font-otf-9.1.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=c72f9b623b45b124ba0c8db1bec461de
diff --git a/metadata/md5-cache/media-fonts/mikachan-font-ttc-9.1 b/metadata/md5-cache/media-fonts/mikachan-font-ttc-9.1
index 5a85f20aae91..8dfad598b87e 100644
--- a/metadata/md5-cache/media-fonts/mikachan-font-ttc-9.1
+++ b/metadata/md5-cache/media-fonts/mikachan-font-ttc-9.1
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Mikachan Japanese TrueType Collection fonts
 EAPI=7
 HOMEPAGE=http://mikachan-font.com/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=free-noncomm
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://gentoo/mikachan-font-9.1.tar.bz2 https://dev.gentoo.org/~usata/mikachan-font-9.1.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=a807ef2f43a612df7c0c0e42a12d82cf
diff --git a/metadata/md5-cache/media-fonts/mikachan-font-ttf-8.9-r2 b/metadata/md5-cache/media-fonts/mikachan-font-ttf-8.9-r2
index 9797847c4005..b20cf64f1d36 100644
--- a/metadata/md5-cache/media-fonts/mikachan-font-ttf-8.9-r2
+++ b/metadata/md5-cache/media-fonts/mikachan-font-ttf-8.9-r2
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Mikachan Japanese TrueType fonts
 EAPI=7
 HOMEPAGE=http://mikachan-font.com/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=free-noncomm
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/mikachan/5513/mikachanfont-8.9.tar.bz2 mirror://sourceforge.jp/mikachan/5514/mikachanfontP-8.9.tar.bz2 mirror://sourceforge.jp/mikachan/5515/mikachanfontPB-8.9.tar.bz2 mirror://sourceforge.jp/mikachan/5516/mikachanfontPS-8.9.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=4b039221a919d3557148ece11763ab40
diff --git a/metadata/md5-cache/media-fonts/mix-mplus-ipa-20130617-r1 b/metadata/md5-cache/media-fonts/mix-mplus-ipa-20130617-r1
index c4646f7d547d..5f901d7905ee 100644
--- a/metadata/md5-cache/media-fonts/mix-mplus-ipa-20130617-r1
+++ b/metadata/md5-cache/media-fonts/mix-mplus-ipa-20130617-r1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Mixing mplus and IPA fonts
 EAPI=7
 HOMEPAGE=https://mix-mplus-ipa.osdn.jp/
@@ -10,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=mplus-fonts IPAfont
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-1m-20130617.zip mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-1p-20130617.zip mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-2m-20130617.zip mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-2p-20130617.zip mirror://sourceforge.jp/mix-mplus-ipa/59022/migu-1p-20130617.zip mirror://sourceforge.jp/mix-mplus-ipa/59022/migu-1c-20130617.zip mirror://sourceforge.jp/mix-mplus-ipa/59022/migu-1m-20130617.zip mirror://sourceforge.jp/mix-mplus-ipa/59022/migu-2m-20130617.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=214fb04849308fb8947b0b2760106bc5
diff --git a/metadata/md5-cache/media-fonts/monafont-2.90-r2 b/metadata/md5-cache/media-fonts/monafont-2.90-r2
index e9ee4bc6ff6b..7f4e660737e6 100644
--- a/metadata/md5-cache/media-fonts/monafont-2.90-r2
+++ b/metadata/md5-cache/media-fonts/monafont-2.90-r2
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip dev-lang/perl x11-apps/bdftopcf x11-apps/mkfontscale
+BDEPEND=app-arch/unzip dev-lang/perl x11-apps/bdftopcf x11-apps/mkfontscale X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Japanese bitmap and TrueType fonts suitable for browsing 2ch
 EAPI=7
 HOMEPAGE=http://monafont.sourceforge.net/
@@ -11,5 +10,5 @@ LICENSE=public-domain
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/monafont/monafont-2.90.tar.bz2 truetype? ( mirror://sourceforge/monafont/monafont-ttf-2.90.zip )
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=1dd6c5c6b8c6b150824f69a6fbb5191c
diff --git a/metadata/md5-cache/media-fonts/monoid-0.61 b/metadata/md5-cache/media-fonts/monoid-0.61
index 7fd974c82bde..45328ff7055e 100644
--- a/metadata/md5-cache/media-fonts/monoid-0.61
+++ b/metadata/md5-cache/media-fonts/monoid-0.61
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Open source coding font
 EAPI=7
 HOMEPAGE=https://larsenwork.com/monoid/ https://github.com/larsenwork/monoid
@@ -10,5 +10,5 @@ LICENSE=MIT OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/monoid-0.61.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=a91a461a604a0f61614d5ccbce7c9882
diff --git a/metadata/md5-cache/media-fonts/montecarlo-0-r1 b/metadata/md5-cache/media-fonts/montecarlo-0-r1
index 5fc555f46ba8..cd8bbe134461 100644
--- a/metadata/md5-cache/media-fonts/montecarlo-0-r1
+++ b/metadata/md5-cache/media-fonts/montecarlo-0-r1
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Monospace font, created by programmers, for programmers
 EAPI=7
 HOMEPAGE=https://www.bok.net/MonteCarlo/
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://www.bok.net/MonteCarlo/downloads/MonteCarlo-PCF.tgz bdf? ( https://www.bok.net/MonteCarlo/downloads/MonteCarlo-BDF.tgz )
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=8aec8eceaa25296a9cc42d1a37fcc318
diff --git a/metadata/md5-cache/media-fonts/mplus-fonts-2.2.4-r1 b/metadata/md5-cache/media-fonts/mplus-fonts-2.2.4-r1
index a63b261297f4..c201a0d7f911 100644
--- a/metadata/md5-cache/media-fonts/mplus-fonts-2.2.4-r1
+++ b/metadata/md5-cache/media-fonts/mplus-fonts-2.2.4-r1
@@ -1,6 +1,5 @@
-BDEPEND=x11-apps/bdftopcf >=x11-apps/mkfontscale-1.2.0
+BDEPEND=x11-apps/bdftopcf >=x11-apps/mkfontscale-1.2.0 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=M+ Japanese bitmap fonts
 EAPI=7
 HOMEPAGE=https://mplus-fonts.osdn.jp/about-en.html
@@ -11,5 +10,5 @@ LICENSE=mplus-fonts
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/mplus-fonts/5030/mplus_bitmap_fonts-2.2.4.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=d299e7357a8c0dbc636cf70a74ba40f0
diff --git a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre063_p1 b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre063_p1
index ce6101ed7dc0..bdd01da2900e 100644
--- a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre063_p1
+++ b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre063_p1
@@ -1,6 +1,5 @@
-BDEPEND=ipafont? ( media-fonts/ja-ipafonts media-gfx/fontforge )
+BDEPEND=ipafont? ( media-fonts/ja-ipafonts media-gfx/fontforge ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=M+ Japanese outline fonts
 EAPI=7
 HOMEPAGE=https://mplus-fonts.osdn.jp/about-en.html
@@ -11,5 +10,5 @@ LICENSE=mplus-fonts ipafont? ( IPAfont )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/mplus-fonts/62344/mplus-TESTFLIGHT-063a.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=f175417a144fea47739db572d02d76c9
diff --git a/metadata/md5-cache/media-fonts/nanum-3.0 b/metadata/md5-cache/media-fonts/nanum-3.0
index 075c77f6b284..2f88702772e5 100644
--- a/metadata/md5-cache/media-fonts/nanum-3.0
+++ b/metadata/md5-cache/media-fonts/nanum-3.0
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Korean fonts distributed by Naver
 EAPI=7
 HOMEPAGE=https://hangeul.naver.com/2017/nanum
@@ -10,5 +10,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/nanum-3.0.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=954a18dad9f7e437366cc6b6d1b9502b
diff --git a/metadata/md5-cache/media-fonts/nanumfont-2.0-r2 b/metadata/md5-cache/media-fonts/nanumfont-2.0-r2
index 5f580b5c5fc4..aafe31fac047 100644
--- a/metadata/md5-cache/media-fonts/nanumfont-2.0-r2
+++ b/metadata/md5-cache/media-fonts/nanumfont-2.0-r2
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Korean monospace font distributed by NHN
 EAPI=7
 HOMEPAGE=https://developers.naver.com/projects/nanumfont
@@ -11,5 +10,5 @@ LICENSE=OFL-1.1
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://dev.naver.com/frs/download.php/441/NanumGothicCoding-2.0.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=35ad2272b1f10102261e66bbbb503a48
diff --git a/metadata/md5-cache/media-fonts/noto-20200521 b/metadata/md5-cache/media-fonts/noto-20200521
index 482344eaa506..211f0e5b141c 100644
--- a/metadata/md5-cache/media-fonts/noto-20200521
+++ b/metadata/md5-cache/media-fonts/noto-20200521
@@ -1,8 +1,9 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Google's font family that aims to support all the world's languages
 EAPI=7
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts
+INHERIT=font
 IUSE=cjk +extra X
 KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=cjk? ( media-fonts/noto-cjk )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlei18n/noto-fonts/archive/49313785484cd4d1f4c0329ee3a8801f158f5ba1.tar.gz -> noto-20200521.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=1d33a2d95fc206eebd717568d390a2fb
diff --git a/metadata/md5-cache/media-fonts/noto-20201226 b/metadata/md5-cache/media-fonts/noto-20201226
index b3a94c41dd6f..7e9b8e003846 100644
--- a/metadata/md5-cache/media-fonts/noto-20201226
+++ b/metadata/md5-cache/media-fonts/noto-20201226
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Google's font family that aims to support all the world's languages
 EAPI=7
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlefonts/noto-fonts
@@ -11,5 +11,5 @@ RDEPEND=cjk? ( media-fonts/noto-cjk )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlei18n/noto-fonts/archive/2b1fbc36600ccd8becb9f894922f644bff2cbc9b.tar.gz -> noto-20201226.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=73bc23215417de8988373bff086005cc
diff --git a/metadata/md5-cache/media-fonts/noto-cjk-20190416 b/metadata/md5-cache/media-fonts/noto-cjk-20190416
index 2d72ec19c489..e791e1d641ad 100644
--- a/metadata/md5-cache/media-fonts/noto-cjk-20190416
+++ b/metadata/md5-cache/media-fonts/noto-cjk-20190416
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Google's CJK font family
 EAPI=7
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-cjk
@@ -10,5 +10,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlei18n/noto-cjk/archive/be6c059ac1587e556e2412b27f5155c8eb3ddbe6.tar.gz -> noto-cjk-20190416.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=b7344e0c74831ffd75c17083d3c945ac
diff --git a/metadata/md5-cache/media-fonts/noto-emoji-20200317-r1 b/metadata/md5-cache/media-fonts/noto-emoji-20200317-r1
index ddc2ea8ca8b7..aa8bcd222617 100644
--- a/metadata/md5-cache/media-fonts/noto-emoji-20200317-r1
+++ b/metadata/md5-cache/media-fonts/noto-emoji-20200317-r1
@@ -1,14 +1,14 @@
-BDEPEND=buildfont? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) app-arch/zopfli || ( ( dev-lang/python:3.8 dev-python/fonttools[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/nototools[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/fonttools[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/nototools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) media-gfx/pngquant x11-libs/cairo || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) )
+BDEPEND=buildfont? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) app-arch/zopfli || ( ( dev-lang/python:3.8 dev-python/fonttools[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/nototools[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/fonttools[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/nototools[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) media-gfx/pngquant x11-libs/cairo || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Google Noto Emoji fonts
 EAPI=7
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji
+INHERIT=font python-any-r1
 IUSE=buildfont X
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=Apache-2.0 OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlefonts/noto-emoji/archive/ac1703e9d7feebbf5443a986e08332b1e1c5afcf.tar.gz -> noto-emoji-20200317.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=font	0667878c2b594871023dd1833d05996f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=0800457671b32750f9c1060c22c05d5a
diff --git a/metadata/md5-cache/media-fonts/noto-emoji-20200916 b/metadata/md5-cache/media-fonts/noto-emoji-20200916
index e8ec41c8be54..b7881448cfe8 100644
--- a/metadata/md5-cache/media-fonts/noto-emoji-20200916
+++ b/metadata/md5-cache/media-fonts/noto-emoji-20200916
@@ -1,14 +1,14 @@
-BDEPEND=buildfont? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) app-arch/zopfli || ( ( dev-lang/python:3.8 >=dev-python/fonttools-4.7.0[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/nototools-0.2.13[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 >=dev-python/fonttools-4.7.0[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/nototools-0.2.13[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) media-gfx/pngquant x11-libs/cairo || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) )
+BDEPEND=buildfont? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) app-arch/zopfli || ( ( dev-lang/python:3.8 >=dev-python/fonttools-4.7.0[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/nototools-0.2.13[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 >=dev-python/fonttools-4.7.0[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/nototools-0.2.13[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) media-gfx/pngquant x11-libs/cairo || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Google Noto Emoji fonts
 EAPI=7
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji
+INHERIT=font python-any-r1
 IUSE=buildfont X
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlefonts/noto-emoji/archive/aac7ccaa4d1dea4543453b96f7d6fc47066a57ff.tar.gz -> noto-emoji-20200916.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=font	0667878c2b594871023dd1833d05996f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=f66a162646be0e12b7813547b3e1153c
diff --git a/metadata/md5-cache/media-fonts/noto-emoji-20201214 b/metadata/md5-cache/media-fonts/noto-emoji-20201214
index 6b9b0a90c29e..ec2bd3f10416 100644
--- a/metadata/md5-cache/media-fonts/noto-emoji-20201214
+++ b/metadata/md5-cache/media-fonts/noto-emoji-20201214
@@ -1,14 +1,14 @@
-BDEPEND=buildfont? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) app-arch/zopfli || ( ( dev-lang/python:3.9 >=dev-python/fonttools-4.7.0[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/nototools-0.2.13[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/fonttools-4.7.0[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/nototools-0.2.13[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 >=dev-python/fonttools-4.7.0[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/nototools-0.2.13[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) media-gfx/pngquant x11-libs/cairo || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) )
+BDEPEND=buildfont? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) app-arch/zopfli || ( ( dev-lang/python:3.9 >=dev-python/fonttools-4.7.0[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/nototools-0.2.13[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/fonttools-4.7.0[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/nototools-0.2.13[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 >=dev-python/fonttools-4.7.0[python_targets_python3_7(-),-python_single_target_python3_7(-)] >=dev-python/nototools-0.2.13[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) media-gfx/pngquant x11-libs/cairo || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Google Noto Emoji fonts
 EAPI=7
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji
+INHERIT=font python-any-r1
 IUSE=buildfont X
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=Apache-2.0 OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlefonts/noto-emoji/archive/e7ac893b3315181f51710de3ba16704ec95e3f51.tar.gz -> noto-emoji-20201214.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=font	0667878c2b594871023dd1833d05996f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=babdd1cfc0d592224139686241fb1a2e
diff --git a/metadata/md5-cache/media-fonts/nunito-1.0-r1 b/metadata/md5-cache/media-fonts/nunito-1.0-r1
index 82941b3bfdee..626752c49ec6 100644
--- a/metadata/md5-cache/media-fonts/nunito-1.0-r1
+++ b/metadata/md5-cache/media-fonts/nunito-1.0-r1
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Sans Serif font with rounded terminals
 EAPI=7
 HOMEPAGE=https://fonts.google.com/specimen/Nunito?preview.text_type=custom https://github.com/vernnobile/NunitoFont
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/nunito-1.0.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=e984b4583831ee3551a93e6670bcf2b7
diff --git a/metadata/md5-cache/media-fonts/nuosu-sil-2.200 b/metadata/md5-cache/media-fonts/nuosu-sil-2.200
index 13efead15ca5..1f4f9715ad46 100644
--- a/metadata/md5-cache/media-fonts/nuosu-sil-2.200
+++ b/metadata/md5-cache/media-fonts/nuosu-sil-2.200
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Unicode font for the standardized Yi script
 EAPI=7
 HOMEPAGE=https://software.sil.org/nuosu/
@@ -10,5 +9,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/nuosu/NuosuSIL-2.200.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=eaa4fa80a47456784a4ccdda4b765609
diff --git a/metadata/md5-cache/media-fonts/office-code-pro-1.004 b/metadata/md5-cache/media-fonts/office-code-pro-1.004
index 09a247612c28..e176b655293f 100644
--- a/metadata/md5-cache/media-fonts/office-code-pro-1.004
+++ b/metadata/md5-cache/media-fonts/office-code-pro-1.004
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Customized version of Source Code Pro
 EAPI=7
 HOMEPAGE=https://github.com/nathco/Office-Code-Pro
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/nathco/Office-Code-Pro/archive/1.004.tar.gz -> office-code-pro-1.004.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=87fec68b6c00b8b1965ebfaa6f2c5fac
diff --git a/metadata/md5-cache/media-fonts/ohsnap-1.8.0 b/metadata/md5-cache/media-fonts/ohsnap-1.8.0
index 6dc289fb371f..4c781dc227e6 100644
--- a/metadata/md5-cache/media-fonts/ohsnap-1.8.0
+++ b/metadata/md5-cache/media-fonts/ohsnap-1.8.0
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Monospace font based on Artwiz Snap with bold and versions with status icons
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/osnapfont
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/osnapfont/ohsnap-1.8.0.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=4da0bcdb71e4ab2c4c8aa0b805fb445f
diff --git a/metadata/md5-cache/media-fonts/oldstandard-2.2 b/metadata/md5-cache/media-fonts/oldstandard-2.2
index 0cc7a0f28dcc..bce38d9c3a39 100644
--- a/metadata/md5-cache/media-fonts/oldstandard-2.2
+++ b/metadata/md5-cache/media-fonts/oldstandard-2.2
@@ -1,12 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=app-arch/unzip
 DESCRIPTION=Old Standard - font with wide range of Latin, Greek and Cyrillic characters
 EAPI=7
 HOMEPAGE=http://www.thessalonica.org.ru/en/fonts.html
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 x86
 LICENSE=OFL
 SLOT=0
 SRC_URI=http://www.thessalonica.org.ru/downloads/oldstandard-2.2.otf.zip http://www.thessalonica.org.ru/downloads/oldstandard-2.2.ttf.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=17cf806b85e42056959ac54a4ec67486
diff --git a/metadata/md5-cache/media-fonts/open-sans-1-r1 b/metadata/md5-cache/media-fonts/open-sans-1-r1
index 1c54e84c90de..0b670f84b3ab 100644
--- a/metadata/md5-cache/media-fonts/open-sans-1-r1
+++ b/metadata/md5-cache/media-fonts/open-sans-1-r1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Clean and modern sans-serif typeface designed for legibility across interfaces
 EAPI=7
 HOMEPAGE=https://www.opensans.com/
@@ -10,5 +9,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/open-sans-1.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=444a8310f7e6f4e81844e8159159c605
diff --git a/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2-r1 b/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2-r1
index af9d510882b0..a6ecdb908cb8 100644
--- a/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2-r1
+++ b/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2-r1
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Chinese TrueType Fonts
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86
 LICENSE=Arphic
 SLOT=0
 SRC_URI=mirror://gentoo/opendesktop-fonts-1.4.2.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=73a5a04b97de7e63ce87942e6f40c0fa
diff --git a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1 b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1
index 405ed7f3c256..a19c5e85d9a2 100644
--- a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1
+++ b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1
@@ -1,13 +1,13 @@
-BDEPEND=>=dev-qt/qtcore-5.12.3:5 >=kde-frameworks/extra-cmake-modules-5.60.0:5 media-gfx/fontforge dev-util/ninja dev-util/cmake
+BDEPEND=>=dev-qt/qtcore-5.12.3:5 >=kde-frameworks/extra-cmake-modules-5.60.0:5 media-gfx/fontforge dev-util/ninja dev-util/cmake X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile configure install nofetch postinst postrm prepare setup test unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Desktop/GUI font family for integrated use with the KDE Plasma desktop
 EAPI=7
 HOMEPAGE=https://invent.kde.org/unmaintained/oxygen-fonts
+INHERIT=cmake font kde.org xdg-utils
 IUSE=X
 KEYWORDS=amd64 ~arm x86
 LICENSE=OFL-1.1
 SLOT=5
 SRC_URI=mirror://kde/unstable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	kde.org	1c383520a04b2d5564075764eaf0bde0	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	font	0667878c2b594871023dd1833d05996f	kde.org	1c383520a04b2d5564075764eaf0bde0
 _md5_=2ea319233a6995c79017d57d9d7c3d1b
diff --git a/metadata/md5-cache/media-fonts/paratype-2.5 b/metadata/md5-cache/media-fonts/paratype-2.5
index faa210b0cea7..8b19b6ed8788 100644
--- a/metadata/md5-cache/media-fonts/paratype-2.5
+++ b/metadata/md5-cache/media-fonts/paratype-2.5
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=ParaType font collection for languages of Russia
 EAPI=7
 HOMEPAGE=https://company.paratype.com/pt-sans-pt-serif
@@ -10,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://www.paratype.ru/uni/public/PTSansOFL.zip -> paratype-2.5_Sans.zip https://www.paratype.ru/uni/public/PTSerifOFL.zip -> paratype-2.5_Serif.zip https://www.paratype.ru/uni/public/PTMonoOFL.zip -> paratype-2.5_Mono.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=0288158e0156e5cf8d768801b8bcaee9
diff --git a/metadata/md5-cache/media-fonts/paratype-astra-1001 b/metadata/md5-cache/media-fonts/paratype-astra-1001
index 0a25749f8113..6c037fe6f348 100644
--- a/metadata/md5-cache/media-fonts/paratype-astra-1001
+++ b/metadata/md5-cache/media-fonts/paratype-astra-1001
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=ParaType Astra Sans/Serif fonts metrically compatible with Times New Roman
 EAPI=7
 HOMEPAGE=https://www.paratype.ru/cinfo/news.asp?NewsId=3469
@@ -10,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://astralinux.com/images/fonts/PTAstraSans&Serif_TTF_ver1001.zip -> paratype-astra-1001.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=1703af67347cd28de25ea37a99d2a478
diff --git a/metadata/md5-cache/media-fonts/pigiarniq-2 b/metadata/md5-cache/media-fonts/pigiarniq-2
index b4c685c6fb43..1d3dfd5ecd47 100644
--- a/metadata/md5-cache/media-fonts/pigiarniq-2
+++ b/metadata/md5-cache/media-fonts/pigiarniq-2
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Nunavut's official Inuktitut font
 EAPI=7
 HOMEPAGE=http://www.ch.gov.nu.ca/en/ComputerTools.aspx
@@ -10,5 +9,5 @@ KEYWORDS=amd64 x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://ch.gov.nu.ca/fonts/pigiarniq.zip -> pigiarniq-2.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=5a0d1d2887b1e88c660d2497a8311941
diff --git a/metadata/md5-cache/media-fonts/polarsys-b612-fonts-1.003-r1 b/metadata/md5-cache/media-fonts/polarsys-b612-fonts-1.003-r1
index 5fcf517b6024..4cbcc7845917 100644
--- a/metadata/md5-cache/media-fonts/polarsys-b612-fonts-1.003-r1
+++ b/metadata/md5-cache/media-fonts/polarsys-b612-fonts-1.003-r1
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Font designed for aircraft cockpit displays
 EAPI=7
 HOMEPAGE=https://b612-font.com/
+INHERIT=font vcs-snapshot
 IUSE=X
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=EPL-1.0 BSD OFL-1.1
 SLOT=0
 SRC_URI=https://git.polarsys.org/c/b612/b612.git/snapshot/b612-bd14fde2544566e620eab106eb8d6f2b7fb1347e.tar.bz2 -> polarsys-b612-fonts-1.003.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=font	0667878c2b594871023dd1833d05996f	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=79abb206adb69a7f0219d8c94439aa42
diff --git a/metadata/md5-cache/media-fonts/polarsys-b612-fonts-1.008-r1 b/metadata/md5-cache/media-fonts/polarsys-b612-fonts-1.008-r1
index 89399f5fda45..1c2b7e1e0f30 100644
--- a/metadata/md5-cache/media-fonts/polarsys-b612-fonts-1.008-r1
+++ b/metadata/md5-cache/media-fonts/polarsys-b612-fonts-1.008-r1
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Font designed for aircraft cockpit displays
 EAPI=7
 HOMEPAGE=https://b612-font.com/
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=EPL-1.0 BSD OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/polarsys/b612/archive/1.008.tar.gz -> polarsys-b612-fonts-1.008.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=daade02af4eee47ac083fc98926738bf
diff --git a/metadata/md5-cache/media-fonts/pothana2k-2006-r1 b/metadata/md5-cache/media-fonts/pothana2k-2006-r1
index 121c35e70175..091a50d5f177 100644
--- a/metadata/md5-cache/media-fonts/pothana2k-2006-r1
+++ b/metadata/md5-cache/media-fonts/pothana2k-2006-r1
@@ -1,12 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=app-arch/unzip
 DESCRIPTION=Pothana 2000 and Vemana fonts for the Telugu script
 EAPI=7
 HOMEPAGE=http://www.kavya-nandanam.com/
+INHERIT=font
 IUSE=doc X
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/pothana2k-2006.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=f43789ceff5eae7052f45a164dc45335
diff --git a/metadata/md5-cache/media-fonts/powerline-symbols-20170508 b/metadata/md5-cache/media-fonts/powerline-symbols-20170508
index 5fdba36f6b2e..24dc3888452c 100644
--- a/metadata/md5-cache/media-fonts/powerline-symbols-20170508
+++ b/metadata/md5-cache/media-fonts/powerline-symbols-20170508
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=OpenType Unicode font with symbols for Powerline/Airline
 EAPI=7
 HOMEPAGE=https://github.com/powerline/powerline
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=MIT-with-advertising
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/powerline-symbols-20170508.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=7f3fd120a6a3a3873cb54cfd39ccec65
diff --git a/metadata/md5-cache/media-fonts/proggy-fonts-1 b/metadata/md5-cache/media-fonts/proggy-fonts-1
index 44cdb22dc43d..f2a4cb58a819 100644
--- a/metadata/md5-cache/media-fonts/proggy-fonts-1
+++ b/metadata/md5-cache/media-fonts/proggy-fonts-1
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=A set of monospaced bitmap programming fonts
 EAPI=7
 HOMEPAGE=http://upperbounds.net/ https://proggyfonts.net/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/proggy-fonts-1.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=109084db28e66a02dc1bde089ffe3440
diff --git a/metadata/md5-cache/media-fonts/qomolangma-2012.05 b/metadata/md5-cache/media-fonts/qomolangma-2012.05
index 8de5cbd71806..1cb3ee8d9ed1 100644
--- a/metadata/md5-cache/media-fonts/qomolangma-2012.05
+++ b/metadata/md5-cache/media-fonts/qomolangma-2012.05
@@ -1,6 +1,5 @@
-BDEPEND=|| ( app-arch/unrar app-arch/rar )
+BDEPEND=|| ( app-arch/unrar app-arch/rar ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Tibetan Unicode Ucan and Umed fonts
 EAPI=7
 HOMEPAGE=http://www.yalasoo.com/English/docs/yalasoo_en_font.html
@@ -10,5 +9,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=free-noncomm
 SLOT=0
 SRC_URI=http://www.yalasoo.com/files/CTRCfonts.rar -> qomolangma-2012.05.rar
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=af62c37c36d4f873ba7648196e656350
diff --git a/metadata/md5-cache/media-fonts/quivira-4.1 b/metadata/md5-cache/media-fonts/quivira-4.1
index 38aaa27190da..9651d6ef45f0 100644
--- a/metadata/md5-cache/media-fonts/quivira-4.1
+++ b/metadata/md5-cache/media-fonts/quivira-4.1
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Unicode font with emoticons and elder scripts like Runes, Gothic, ancient Greek
 EAPI=7
 HOMEPAGE=http://www.quivira-font.com/
@@ -9,5 +9,5 @@ KEYWORDS=amd64 arm ppc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.quivira-font.com/files/Quivira.otf -> quivira-4.1.otf doc? ( http://www.quivira-font.com/files/Quivira.pdf -> quivira-4.1.pdf http://www.quivira-font.com/files/QuiviraTestpage.pdf -> quivira-4.1-Testpage.pdf http://www.quivira-font.com/files/QuiviraCombining.pdf -> quivira-4.1-Combining.pdf http://www.quivira-font.com/files/QuiviraPUA.pdf -> quivira-4.1-PUA.pdf )
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=5ad1e86bdc8d9dd17b6c6f0b3e9a966d
diff --git a/metadata/md5-cache/media-fonts/ricty-3.2.0-r2 b/metadata/md5-cache/media-fonts/ricty-3.2.0-r2
index a1aacea722ee..dd2f724dd91d 100644
--- a/metadata/md5-cache/media-fonts/ricty-3.2.0-r2
+++ b/metadata/md5-cache/media-fonts/ricty-3.2.0-r2
@@ -1,6 +1,5 @@
-BDEPEND=media-fonts/inconsolata >=media-fonts/mix-mplus-ipa-20111002 media-gfx/fontforge
+BDEPEND=media-fonts/inconsolata >=media-fonts/mix-mplus-ipa-20111002 media-gfx/fontforge X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Beautiful sans-serif monotype Japanese font designed for code listings
 EAPI=7
 HOMEPAGE=https://rictyfonts.github.io/
@@ -11,5 +10,5 @@ LICENSE=public-domain
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=https://github.com/yascentur/Ricty/tarball/3.2.0 -> Ricty-3.2.0.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=a2d1a8bf322fb5090a25ea806a226249
diff --git a/metadata/md5-cache/media-fonts/roboto-2.138 b/metadata/md5-cache/media-fonts/roboto-2.138
index 89b04b972669..988c53ca9b7d 100644
--- a/metadata/md5-cache/media-fonts/roboto-2.138
+++ b/metadata/md5-cache/media-fonts/roboto-2.138
@@ -1,5 +1,6 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=app-arch/unzip
 DESCRIPTION=Standard font for Android 4.0 (Ice Cream Sandwich) and later
 EAPI=7
 HOMEPAGE=https://github.com/google/roboto
@@ -9,5 +10,5 @@ KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/google/roboto/releases/download/v2.138/roboto-unhinted.zip -> roboto-2.138.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=3c07c4c499ca435c5966c035ae70fa3a
diff --git a/metadata/md5-cache/media-fonts/sazanami-20040629 b/metadata/md5-cache/media-fonts/sazanami-20040629
index b3d0be0f1546..4a683320da77 100644
--- a/metadata/md5-cache/media-fonts/sazanami-20040629
+++ b/metadata/md5-cache/media-fonts/sazanami-20040629
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Sazanami Japanese TrueType fonts
 EAPI=7
 HOMEPAGE=http://efont.sourceforge.jp/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=mplus-fonts public-domain
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=5144b69da78adb556320095a25862303
diff --git a/metadata/md5-cache/media-fonts/sgi-fonts-1.0 b/metadata/md5-cache/media-fonts/sgi-fonts-1.0
index 92132073d46f..1d62b2f24290 100644
--- a/metadata/md5-cache/media-fonts/sgi-fonts-1.0
+++ b/metadata/md5-cache/media-fonts/sgi-fonts-1.0
@@ -1,13 +1,13 @@
-BDEPEND=>=app-arch/rpm2targz-9.0.0.3g
+BDEPEND=>=app-arch/rpm2targz-9.0.0.3g X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=SGI fonts collection
 EAPI=7
 HOMEPAGE=http://oss.sgi.com/projects/sgi_propack
+INHERIT=rpm font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ppc64 s390 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/suse/i386/9.1/suse/noarch/sgi-fonts-1.0-705.noarch.rpm
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	rpm	760ff223c2c4299b68ea901e24c4cabd	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	rpm	760ff223c2c4299b68ea901e24c4cabd	font	0667878c2b594871023dd1833d05996f
 _md5_=817f414330d79176ec3edeae7411a188
diff --git a/metadata/md5-cache/media-fonts/shinonome-0.9.11 b/metadata/md5-cache/media-fonts/shinonome-0.9.11
index 4cfec1d064ca..ec5cf09c120a 100644
--- a/metadata/md5-cache/media-fonts/shinonome-0.9.11
+++ b/metadata/md5-cache/media-fonts/shinonome-0.9.11
@@ -1,14 +1,14 @@
-BDEPEND=x11-apps/bdftopcf
+BDEPEND=x11-apps/bdftopcf X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile configure install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Japanese bitmap fonts for X
 EAPI=7
 HOMEPAGE=http://openlab.jp/efont/shinonome/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=public-domain
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://openlab.jp/efont/dist/shinonome/shinonome-0.9.11.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=105ca8a58a64656ace8e64814b553f1c
diff --git a/metadata/md5-cache/media-fonts/signika-1.001 b/metadata/md5-cache/media-fonts/signika-1.001
index 69d298a99c4e..8be299deb291 100644
--- a/metadata/md5-cache/media-fonts/signika-1.001
+++ b/metadata/md5-cache/media-fonts/signika-1.001
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Sans-serif with gentle character designed for signage
 EAPI=7
 HOMEPAGE=http://ancymonic.com/projects/Signika
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/signika-1.001.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=ba6c4e8ee7ecb2c16bf4a21b646b9c2a
diff --git a/metadata/md5-cache/media-fonts/sil-abyssinica-1.500 b/metadata/md5-cache/media-fonts/sil-abyssinica-1.500
index 60bf25824f22..e18724acfd3d 100644
--- a/metadata/md5-cache/media-fonts/sil-abyssinica-1.500
+++ b/metadata/md5-cache/media-fonts/sil-abyssinica-1.500
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=SIL Opentype Unicode fonts for Ethiopic languages
 EAPI=7
 HOMEPAGE=https://software.sil.org/abyssinica/
@@ -10,5 +9,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-1.500.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=f913091b83bb8c5307368916323f6957
diff --git a/metadata/md5-cache/media-fonts/sil-arabicfonts-3.000 b/metadata/md5-cache/media-fonts/sil-arabicfonts-3.000
index 9a2f1aa376cd..a4bf937b13c2 100644
--- a/metadata/md5-cache/media-fonts/sil-arabicfonts-3.000
+++ b/metadata/md5-cache/media-fonts/sil-arabicfonts-3.000
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=SIL Opentype Unicode fonts for Arabic Languages
 EAPI=7
 HOMEPAGE=https://software.sil.org/arabicfonts/
@@ -10,5 +9,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/scheherazade/ScheherazadeNew-3.000.zip https://software.sil.org/downloads/r/lateef/LateefGR-1.200.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=64db180ba9629c63923cfbcfad6c833b
diff --git a/metadata/md5-cache/media-fonts/sil-charis-5.000-r1 b/metadata/md5-cache/media-fonts/sil-charis-5.000-r1
index c2fa6ba083b0..8b1d6ed3fe6d 100644
--- a/metadata/md5-cache/media-fonts/sil-charis-5.000-r1
+++ b/metadata/md5-cache/media-fonts/sil-charis-5.000-r1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Serif typeface for Roman and Cyrillic languages
 EAPI=7
 HOMEPAGE=https://software.sil.org/charis/
@@ -10,5 +9,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/charis/CharisSIL-5.000.zip -> sil-charis-5.000.zip compact? ( https://software.sil.org/downloads/r/charis/CharisSILCompact-5.000.zip )
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=c3b2f2c80124b0be35a9a9b0769850aa
diff --git a/metadata/md5-cache/media-fonts/sil-doulos-5.000-r1 b/metadata/md5-cache/media-fonts/sil-doulos-5.000-r1
index 145753fd9bcc..8611ac716d07 100644
--- a/metadata/md5-cache/media-fonts/sil-doulos-5.000-r1
+++ b/metadata/md5-cache/media-fonts/sil-doulos-5.000-r1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=SIL font for Roman and Cyrillic Languages
 EAPI=7
 HOMEPAGE=https://software.sil.org/doulos/
@@ -10,5 +9,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/doulos/DoulosSIL-5.000.zip -> sil-doulos-5.000.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=2ab014eb36206cba9d41c318e676ba33
diff --git a/metadata/md5-cache/media-fonts/sil-ezra-2.51 b/metadata/md5-cache/media-fonts/sil-ezra-2.51
index c3cfbf34e625..793af9a794ac 100644
--- a/metadata/md5-cache/media-fonts/sil-ezra-2.51
+++ b/metadata/md5-cache/media-fonts/sil-ezra-2.51
@@ -1,13 +1,13 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=SIL Ezra - Unicode Opentype fonts for Biblical Hebrew
 EAPI=7
 HOMEPAGE=http://scripts.sil.org/EzraSIL_Home
+INHERIT=font
 IUSE=doc X
 KEYWORDS=~alpha amd64 arm ~ia64 ~ppc s390 sparc x86
 LICENSE=MIT OFL-1.1
 SLOT=0
 SRC_URI=mirror://gentoo/EzraSIL251.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=91182330015a43ce93bcea0440ab13de
diff --git a/metadata/md5-cache/media-fonts/sil-galatia-2.1 b/metadata/md5-cache/media-fonts/sil-galatia-2.1
index 3a69221efbc3..e736ca1b6511 100644
--- a/metadata/md5-cache/media-fonts/sil-galatia-2.1
+++ b/metadata/md5-cache/media-fonts/sil-galatia-2.1
@@ -1,13 +1,13 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Galatia SIL Greek Unicode Fonts package
 EAPI=7
 HOMEPAGE=http://scripts.sil.org/SILgrkuni
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=mirror://gentoo/GalSIL21.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=f47b0eb6276a91aa60f3d304f0cb6283
diff --git a/metadata/md5-cache/media-fonts/sil-gentium-5.000-r1 b/metadata/md5-cache/media-fonts/sil-gentium-5.000-r1
index 2cc08d90427b..ebddc166dc6e 100644
--- a/metadata/md5-cache/media-fonts/sil-gentium-5.000-r1
+++ b/metadata/md5-cache/media-fonts/sil-gentium-5.000-r1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Gentium Plus unicode font for Latin and Greek languages
 EAPI=7
 HOMEPAGE=https://software.sil.org/gentium/
@@ -10,5 +9,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/gentium/GentiumPlus-5.000.zip -> sil-gentium-5.000.zip compact? ( https://software.sil.org/downloads/r/gentium/GentiumPlusCompact-5.000.zip )
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=a2171247036830b192fb0355c03a2a77
diff --git a/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1 b/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1
index f7b488c8d7b3..37952c988e44 100644
--- a/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1
+++ b/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=SIL fonts for Myanmar script
 EAPI=7
 HOMEPAGE=http://scripts.sil.org/padauk
@@ -10,5 +9,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=OFL
 SLOT=0
 SRC_URI=mirror://gentoo/padauk-2.8.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=4d7f179e4fd2a831e4ce8b8e16648ccf
diff --git a/metadata/md5-cache/media-fonts/sil-padauk-4.000 b/metadata/md5-cache/media-fonts/sil-padauk-4.000
index e92a7cc8aecf..3e6157f2f9c2 100644
--- a/metadata/md5-cache/media-fonts/sil-padauk-4.000
+++ b/metadata/md5-cache/media-fonts/sil-padauk-4.000
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=SIL fonts for Myanmar script
 EAPI=7
 HOMEPAGE=https://software.sil.org/padauk/
@@ -10,5 +9,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=OFL
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/padauk/Padauk-4.000.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=d6ba581ea1d87161a5cf8041565280c6
diff --git a/metadata/md5-cache/media-fonts/sophia-nubian-1.0 b/metadata/md5-cache/media-fonts/sophia-nubian-1.0
index 1c35056205e8..ce5656c01660 100644
--- a/metadata/md5-cache/media-fonts/sophia-nubian-1.0
+++ b/metadata/md5-cache/media-fonts/sophia-nubian-1.0
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Unicode sans-serif typeface for Coptic/Nubian languages
 EAPI=7
 HOMEPAGE=https://software.sil.org/SophiaNubian/
@@ -10,5 +9,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/sophianubian/SophiaNubian-1.0.zip -> sophia-nubian-1.0.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=0ee40982e3c330e45dfbdde60911996c
diff --git a/metadata/md5-cache/media-fonts/source-han-sans-1.004 b/metadata/md5-cache/media-fonts/source-han-sans-1.004
index 5a1f34b4a30f..e39ed2b82362 100644
--- a/metadata/md5-cache/media-fonts/source-han-sans-1.004
+++ b/metadata/md5-cache/media-fonts/source-han-sans-1.004
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Pan-CJK OpenType/CFF font family
 EAPI=7
 HOMEPAGE=https://github.com/adobe-fonts/source-han-sans/
@@ -12,5 +11,5 @@ REQUIRED_USE=|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=l10n_ja? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansJP.zip -> source-han-sans-ja-1.004.zip ) l10n_ko? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansKR.zip -> source-han-sans-ko-1.004.zip ) l10n_zh-CN? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansCN.zip -> source-han-sans-zh_CN-1.004.zip ) l10n_zh-TW? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansTW.zip -> source-han-sans-zh_TW-1.004.zip )
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=a45cce0c31621ee8c777057a32cfad5c
diff --git a/metadata/md5-cache/media-fonts/source-pro-20170111 b/metadata/md5-cache/media-fonts/source-pro-20170111
index b60363d560e8..b50e66af8a32 100644
--- a/metadata/md5-cache/media-fonts/source-pro-20170111
+++ b/metadata/md5-cache/media-fonts/source-pro-20170111
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Adobe's open source typeface family designed for UI environments
 EAPI=7
 HOMEPAGE=https://adobe-fonts.github.io/source-sans-pro/ https://adobe-fonts.github.io/source-serif-pro/ https://adobe-fonts.github.io/source-code-pro/
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig cjk? ( media-fonts/source-han-sans )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/adobe-fonts/source-sans-pro/archive/2.020R-ro/1.075R-it.tar.gz -> source-sans-pro-20170111.tar.gz https://github.com/adobe-fonts/source-serif-pro/archive/2.000R.tar.gz -> source-serif-pro-20170111.tar.gz https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.tar.gz -> source-code-pro-20170111.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=78370064de319035b242347c431b9e2b
diff --git a/metadata/md5-cache/media-fonts/stix-fonts-1.1.1 b/metadata/md5-cache/media-fonts/stix-fonts-1.1.1
index d1b519b75919..49ec1a2e95d8 100644
--- a/metadata/md5-cache/media-fonts/stix-fonts-1.1.1
+++ b/metadata/md5-cache/media-fonts/stix-fonts-1.1.1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Comprehensive OpenType font set of mathematical symbols and alphabets
 EAPI=7
 HOMEPAGE=https://www.stixfonts.org/
@@ -11,5 +10,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=mirror://sourceforge/stixfonts/STIXv1.1.1-word.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=fdbc45461d0fe59f18647bda8ba76933
diff --git a/metadata/md5-cache/media-fonts/stix-fonts-2.11 b/metadata/md5-cache/media-fonts/stix-fonts-2.11
index dcbc7e4a9ae1..92a30b38ab76 100644
--- a/metadata/md5-cache/media-fonts/stix-fonts-2.11
+++ b/metadata/md5-cache/media-fonts/stix-fonts-2.11
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Comprehensive OpenType font set of mathematical symbols and alphabets
 EAPI=7
 HOMEPAGE=https://www.stixfonts.org/
@@ -11,5 +10,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/stipub/stixfonts/v2.11/zipfiles/static_otf.zip -> stix-fonts-2.11-otf.zip https://raw.githubusercontent.com/stipub/stixfonts/v2.11/docs/FONTLOG.txt -> stix-fonts-2.11-FONTLOG.txt https://raw.githubusercontent.com/stipub/stixfonts/v2.11/docs/STIXTwoMath-Regular.pdf -> stix-fonts-2.11-STIXTwoMath-Regular.pdf https://raw.githubusercontent.com/stipub/stixfonts/v2.11/docs/STIXTwoText-Regular.pdf -> stix-fonts-2.11-STIXTwoText-Regular.pdf
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=9333b40ce575f9346cd433cd6cc8a8ed
diff --git a/metadata/md5-cache/media-fonts/takao-fonts-003.02.01 b/metadata/md5-cache/media-fonts/takao-fonts-003.02.01
index 31d6ac1c88d2..67181fc09287 100644
--- a/metadata/md5-cache/media-fonts/takao-fonts-003.02.01
+++ b/metadata/md5-cache/media-fonts/takao-fonts-003.02.01
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=A community developed derivatives of IPA Fonts
 EAPI=7
 HOMEPAGE=https://launchpad.net/takao-fonts
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=IPAfont
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=https://launchpad.net/takao-fonts/003.02/003.02.01/+download/takao-fonts-ttf-003.02.01.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=801e4f90e1cf866bac77a8b95ea685a9
diff --git a/metadata/md5-cache/media-fonts/tengwar-fonts-1.9d b/metadata/md5-cache/media-fonts/tengwar-fonts-1.9d
index 34e7286e945a..eb0acf02c201 100644
--- a/metadata/md5-cache/media-fonts/tengwar-fonts-1.9d
+++ b/metadata/md5-cache/media-fonts/tengwar-fonts-1.9d
@@ -1,13 +1,13 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Tengwar - the Elvish letters, created by Feanor and described by J.R.R.Tolkien)
 EAPI=7
 HOMEPAGE=http://www.tengwar.art.pl/ktt/en/download.php
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=free-noncomm
 SLOT=0
 SRC_URI=http://www.tengwar.art.pl/zip/tengq19d.zip http://www.tengwar.art.pl/zip/tengs19d.zip http://www.tengwar.art.pl/zip/tengn19d.zip http://www.tengwar.art.pl/zip/parmaite12b.zip http://www.tengwar.art.pl/zip/tcurs100.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=3adf83cb76bceb8f93eb71c99e02ca39
diff --git a/metadata/md5-cache/media-fonts/terminus-font-4.49 b/metadata/md5-cache/media-fonts/terminus-font-4.49
index c0b9e810b1ff..c46f0e23e9b6 100644
--- a/metadata/md5-cache/media-fonts/terminus-font-4.49
+++ b/metadata/md5-cache/media-fonts/terminus-font-4.49
@@ -1,13 +1,15 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=app-arch/gzip || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/awk pcf? ( x11-apps/bdftopcf ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=app-arch/gzip || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/awk pcf? ( x11-apps/bdftopcf )
 DESCRIPTION=A clean fixed font for the console and X11
 EAPI=7
 HOMEPAGE=http://terminus-font.sourceforge.net/
+INHERIT=font python-any-r1
 IUSE=a-like-o +center-tilde distinct-l otf +pcf +pcf-unicode-only +psf quote ru-dv +ru-g ru-i ru-k X
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=OFL-1.1 GPL-2
 REQUIRED_USE=X? ( pcf )
 SLOT=0
 SRC_URI=mirror://sourceforge/terminus-font/terminus-font-4.49/terminus-font-4.49.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=font	0667878c2b594871023dd1833d05996f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=b1d5813cf4d6e010be86297ebcdb17e2
diff --git a/metadata/md5-cache/media-fonts/termsyn-1.8.7 b/metadata/md5-cache/media-fonts/termsyn-1.8.7
index 3519c8603459..e7688907aa7b 100644
--- a/metadata/md5-cache/media-fonts/termsyn-1.8.7
+++ b/metadata/md5-cache/media-fonts/termsyn-1.8.7
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Monospaced font based on terminus and tamsyn
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/termsyn/
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/termsyn/files/termsyn-1.8.7.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=aafa40c979a349391617c2b9aae40bd0
diff --git a/metadata/md5-cache/media-fonts/tex-gyre-2.501 b/metadata/md5-cache/media-fonts/tex-gyre-2.501
index bc808d95deee..1ac0850052e5 100644
--- a/metadata/md5-cache/media-fonts/tex-gyre-2.501
+++ b/metadata/md5-cache/media-fonts/tex-gyre-2.501
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Extensive remake of freely available URW fonts
 EAPI=7
 HOMEPAGE=http://www.gust.org.pl/projects/e-foundry/tex-gyre
@@ -10,5 +9,5 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa x86
 LICENSE=|| ( GFL LPPL-1.3c )
 SLOT=0
 SRC_URI=http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg2_501otf.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=9f9e629fe543e88b4ed4864937bb16b3
diff --git a/metadata/md5-cache/media-fonts/texcm-ttf-1.0 b/metadata/md5-cache/media-fonts/texcm-ttf-1.0
index af1a3db83c47..ab7ff6491a73 100644
--- a/metadata/md5-cache/media-fonts/texcm-ttf-1.0
+++ b/metadata/md5-cache/media-fonts/texcm-ttf-1.0
@@ -1,13 +1,13 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=TeX's Computer Modern Fonts for MathML
 EAPI=7
 HOMEPAGE=http://www.mozilla.org/projects/mathml/fonts/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=bakoma
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/texcm-ttf-1.0.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=6e8ae651b86d23129cc8a09e6502479c
diff --git a/metadata/md5-cache/media-fonts/thaifonts-scalable-0.7.2 b/metadata/md5-cache/media-fonts/thaifonts-scalable-0.7.2
index 2592d526e204..c8c907a6a970 100644
--- a/metadata/md5-cache/media-fonts/thaifonts-scalable-0.7.2
+++ b/metadata/md5-cache/media-fonts/thaifonts-scalable-0.7.2
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Collection of free fonts for Thai
 EAPI=7
 HOMEPAGE=https://linux.thai.net/projects/thaifonts-scalable
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2-with-font-exception GPL-3-with-font-exception )
 SLOT=0
 SRC_URI=https://github.com/tlwg/fonts-tlwg/releases/download/v0.7.2/ttf-tlwg-0.7.2.tar.xz -> thaifonts-scalable-0.7.2.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=3b5068833f6056055a5c02217e99cc85
diff --git a/metadata/md5-cache/media-fonts/tibetan-machine-font-1.901 b/metadata/md5-cache/media-fonts/tibetan-machine-font-1.901
index e820ea336556..9549c45426e6 100644
--- a/metadata/md5-cache/media-fonts/tibetan-machine-font-1.901
+++ b/metadata/md5-cache/media-fonts/tibetan-machine-font-1.901
@@ -1,13 +1,13 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Fonts for the Tibetan and Himalayan languages
 EAPI=7
 HOMEPAGE=http://www.thdl.org/
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/TibetanMachineUnicodeFont-1.901.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=9fa0b7c6b42a6b8aafadd83509e31b36
diff --git a/metadata/md5-cache/media-fonts/ttf-bitstream-vera-1.10-r3 b/metadata/md5-cache/media-fonts/ttf-bitstream-vera-1.10-r3
index 1d5a0b0f67b7..1ec578b87402 100644
--- a/metadata/md5-cache/media-fonts/ttf-bitstream-vera-1.10-r3
+++ b/metadata/md5-cache/media-fonts/ttf-bitstream-vera-1.10-r3
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Bitstream Vera font family
 EAPI=7
 HOMEPAGE=https://www.gnome.org/fonts/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=BitstreamVera
 SLOT=0
 SRC_URI=mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=1775302e2a4d728188cff0f740e6f642
diff --git a/metadata/md5-cache/media-fonts/ubuntu-font-family-0.83-r1 b/metadata/md5-cache/media-fonts/ubuntu-font-family-0.83-r1
index b3bab0f3cf28..4ec29b3ec087 100644
--- a/metadata/md5-cache/media-fonts/ubuntu-font-family-0.83-r1
+++ b/metadata/md5-cache/media-fonts/ubuntu-font-family-0.83-r1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Set of matching libre/open fonts funded by Canonical
 EAPI=7
 HOMEPAGE=https://design.ubuntu.com/font/
@@ -10,5 +9,5 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=UbuntuFontLicense-1.0
 SLOT=0
 SRC_URI=https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip -> ubuntu-font-family-0.83.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=738703ca2ae2bba8c656f3d6d8d2f9d6
diff --git a/metadata/md5-cache/media-fonts/umeplus-fonts-20180604 b/metadata/md5-cache/media-fonts/umeplus-fonts-20180604
index 6a7574c0265e..9843632a0941 100644
--- a/metadata/md5-cache/media-fonts/umeplus-fonts-20180604
+++ b/metadata/md5-cache/media-fonts/umeplus-fonts-20180604
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Modified Ume and M+ fonts for Japanese
 EAPI=7
 HOMEPAGE=http://linuxplayers.g1.xrea.com/modified_fonts_01.html
@@ -10,5 +10,5 @@ LICENSE=mplus-fonts public-domain
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://free.nchc.org.tw/osdn//users/21/21734/umeplus-fonts-20180604.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=4d3c8ef76ae55ffd94b47475f7070434
diff --git a/metadata/md5-cache/media-fonts/unfonts-1.0.2_pre080608-r1 b/metadata/md5-cache/media-fonts/unfonts-1.0.2_pre080608-r1
index 93b07048c61c..35f56161b543 100644
--- a/metadata/md5-cache/media-fonts/unfonts-1.0.2_pre080608-r1
+++ b/metadata/md5-cache/media-fonts/unfonts-1.0.2_pre080608-r1
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Korean Un fonts collection
 EAPI=7
 HOMEPAGE=http://kldp.net/projects/unfonts/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://gentoo/un-fonts-core-1.0.2-080608-r1.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=9bed9d4b8ebd860c118c1beee61c8e16
diff --git a/metadata/md5-cache/media-fonts/unfonts-extra-1.0.2_pre080608-r1 b/metadata/md5-cache/media-fonts/unfonts-extra-1.0.2_pre080608-r1
index 179acd939ad6..93c2d586e5bf 100644
--- a/metadata/md5-cache/media-fonts/unfonts-extra-1.0.2_pre080608-r1
+++ b/metadata/md5-cache/media-fonts/unfonts-extra-1.0.2_pre080608-r1
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Korean Un fonts extras collection
 EAPI=7
 HOMEPAGE=http://kldp.net/projects/unfonts/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://gentoo/un-fonts-extra-1.0.2-080608-r1.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=c3ddd01a158708ed87690184a26b4042
diff --git a/metadata/md5-cache/media-fonts/unifont-13.0.01 b/metadata/md5-cache/media-fonts/unifont-13.0.01
index b5eeead758a3..c9fcac3a1e95 100644
--- a/metadata/md5-cache/media-fonts/unifont-13.0.01
+++ b/metadata/md5-cache/media-fonts/unifont-13.0.01
@@ -1,14 +1,14 @@
-BDEPEND=fontforge? ( app-text/bdf2psf dev-lang/perl dev-perl/GD[png(-)] media-gfx/fontforge x11-apps/bdftopcf )
+BDEPEND=fontforge? ( app-text/bdf2psf dev-lang/perl dev-perl/GD[png(-)] media-gfx/fontforge x11-apps/bdftopcf ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font
 EAPI=7
 HOMEPAGE=http://unifoundry.com/
+INHERIT=font toolchain-funcs
 IUSE=fontforge utils X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/unifont/unifont-13.0.01/unifont-13.0.01.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=font	0667878c2b594871023dd1833d05996f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=e5c3ec2ada22de75d72bca4090d8acc2
diff --git a/metadata/md5-cache/media-fonts/urw-fonts-2.4.9 b/metadata/md5-cache/media-fonts/urw-fonts-2.4.9
index 4f6d4b0893e6..7d1ca4bdb0b0 100644
--- a/metadata/md5-cache/media-fonts/urw-fonts-2.4.9
+++ b/metadata/md5-cache/media-fonts/urw-fonts-2.4.9
@@ -1,14 +1,14 @@
-BDEPEND=>=app-arch/rpm2targz-9.0.0.3g
+BDEPEND=>=app-arch/rpm2targz-9.0.0.3g X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=free good quality fonts gpl'd by URW++
 EAPI=7
 HOMEPAGE=http://www.urwpp.de/
+INHERIT=estack rpm font
 IUSE=X
 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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!media-fonts/gnu-gs-fonts-std !media-fonts/gnu-gs-fonts-other
 SLOT=0
 SRC_URI=mirror://gentoo/urw-fonts-2.4-9.fc13.src.rpm
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	rpm	760ff223c2c4299b68ea901e24c4cabd	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	rpm	760ff223c2c4299b68ea901e24c4cabd	font	0667878c2b594871023dd1833d05996f
 _md5_=51f68f40f70a5148ec0ba4ffcf05ad62
diff --git a/metadata/md5-cache/media-fonts/urwvn-fonts-3.05 b/metadata/md5-cache/media-fonts/urwvn-fonts-3.05
index f3445b3bf4b4..9fef0917fbcc 100644
--- a/metadata/md5-cache/media-fonts/urwvn-fonts-3.05
+++ b/metadata/md5-cache/media-fonts/urwvn-fonts-3.05
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Vietnamese version of the standard PostScript fonts from URW++
 EAPI=7
 HOMEPAGE=http://vntex.sourceforge.net/
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86
 LICENSE=GPL-2 Aladdin
 SLOT=0
 SRC_URI=mirror://sourceforge/project/vntex/urwvn-ttf/urwvn-3.05-ttf.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=ca6453aacf9bf11675b2646dd73f283e
diff --git a/metadata/md5-cache/media-fonts/vdrsymbols-ttf-20100612 b/metadata/md5-cache/media-fonts/vdrsymbols-ttf-20100612
index fc8a40e33dcf..f6e9bfdbd7c8 100644
--- a/metadata/md5-cache/media-fonts/vdrsymbols-ttf-20100612
+++ b/metadata/md5-cache/media-fonts/vdrsymbols-ttf-20100612
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Font that contains symbols needed for VDR
 EAPI=7
 HOMEPAGE=http://andreas.vdr-developer.org/fonts/
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 ~arm x86
 LICENSE=BitstreamVera
 SLOT=0
 SRC_URI=http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=44df4b4b5772609492f54a12b1e1e7bf
diff --git a/metadata/md5-cache/media-fonts/viga-1 b/metadata/md5-cache/media-fonts/viga-1
index 41fa7a31375f..d205f7aa1f3f 100644
--- a/metadata/md5-cache/media-fonts/viga-1
+++ b/metadata/md5-cache/media-fonts/viga-1
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Sans-serif font with great personality and good on-screen performance
 EAPI=7
 HOMEPAGE=https://www.fontsquirrel.com/fonts/viga
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/viga-1.tar.xz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=9c7c1826929cdf899601f548afc0cc1b
diff --git a/metadata/md5-cache/media-fonts/vlgothic-20141206 b/metadata/md5-cache/media-fonts/vlgothic-20141206
index 023c24304b8c..a3e62a7c2610 100644
--- a/metadata/md5-cache/media-fonts/vlgothic-20141206
+++ b/metadata/md5-cache/media-fonts/vlgothic-20141206
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Japanese TrueType font from Vine Linux
 EAPI=7
 HOMEPAGE=http://vlgothic.dicey.org/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=vlgothic mplus-fonts BSD-2
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/vlgothic/62375/VLGothic-20141206.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=924284e6b4ba5d61f4eae488c5a1e18b
diff --git a/metadata/md5-cache/media-fonts/vollkorn-2.1 b/metadata/md5-cache/media-fonts/vollkorn-2.1
index 497d621e6d50..851bccce80d8 100644
--- a/metadata/md5-cache/media-fonts/vollkorn-2.1
+++ b/metadata/md5-cache/media-fonts/vollkorn-2.1
@@ -1,14 +1,14 @@
-BDEPEND=app-arch/unzip
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Vollkorn, the free and healthy typeface for bread and butter use
 EAPI=7
 HOMEPAGE=http://friedrichalthausen.de/?page_id=411
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=OFL-1.1
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://friedrichalthausen.de/Vollkorn-2.1.zip
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=86f08f5d2c7e65949a476a22d4e13d4f
diff --git a/metadata/md5-cache/media-fonts/webby-fonts-1 b/metadata/md5-cache/media-fonts/webby-fonts-1
index d5541e573301..db9cb6373a16 100644
--- a/metadata/md5-cache/media-fonts/webby-fonts-1
+++ b/metadata/md5-cache/media-fonts/webby-fonts-1
@@ -1,12 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=A small proportional bitmap font for use in webpages
 EAPI=7
 HOMEPAGE=http://www.proggyfonts.com/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 ~ia64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://dl.liveforge.org/fonts/webby-fonts-1.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=5f6efb436756729251171063d88e1570
diff --git a/metadata/md5-cache/media-fonts/wqy-bitmapfont-1.0.0_rc1 b/metadata/md5-cache/media-fonts/wqy-bitmapfont-1.0.0_rc1
index ec6fbffdb0da..af21eb5f8917 100644
--- a/metadata/md5-cache/media-fonts/wqy-bitmapfont-1.0.0_rc1
+++ b/metadata/md5-cache/media-fonts/wqy-bitmapfont-1.0.0_rc1
@@ -1,13 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=WenQuanYi Bitmap Song CJK font
 EAPI=7
 HOMEPAGE=http://wenq.org/wqy2/index.cgi?Home
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86
 LICENSE=GPL-2
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/wqy/wqy-bitmapsong-pcf-1.0.0-RC1.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=bcd28ea4deedfb19e892d4a99420940c
diff --git a/metadata/md5-cache/media-fonts/wqy-microhei-0.2.0_beta-r1 b/metadata/md5-cache/media-fonts/wqy-microhei-0.2.0_beta-r1
index 0a8dd96b3f95..9ccd82ff5683 100644
--- a/metadata/md5-cache/media-fonts/wqy-microhei-0.2.0_beta-r1
+++ b/metadata/md5-cache/media-fonts/wqy-microhei-0.2.0_beta-r1
@@ -1,6 +1,5 @@
-BDEPEND=dev-util/xdelta:3
+BDEPEND=dev-util/xdelta:3 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Droid derived Sans-Serif style CJK font
 EAPI=7
 HOMEPAGE=http://wenq.org/wqy2/index.cgi https://sourceforge.net/projects/wqy/
@@ -11,5 +10,5 @@ LICENSE=Apache-2.0 GPL-3
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/wqy/wqy-microhei-0.2.0-beta.tar.gz https://dev.gentoo.org/~dlan/distfiles/wqy-microhei.ttc.xd3
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=9fb0365c26f6609ac55f2de58d5ae54b
diff --git a/metadata/md5-cache/media-fonts/wqy-unibit-1.1.0_p1-r1 b/metadata/md5-cache/media-fonts/wqy-unibit-1.1.0_p1-r1
index df60e50a9444..e0a8057f69d4 100644
--- a/metadata/md5-cache/media-fonts/wqy-unibit-1.1.0_p1-r1
+++ b/metadata/md5-cache/media-fonts/wqy-unibit-1.1.0_p1-r1
@@ -1,6 +1,5 @@
-BDEPEND=media-gfx/ebdftopcf
+BDEPEND=media-gfx/ebdftopcf X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=WenQuanYi Unibit CJK font
 EAPI=7
 HOMEPAGE=http://wenq.org/wqy2/index.cgi https://sourceforge.net/projects/wqy/
@@ -11,5 +10,5 @@ LICENSE=GPL-2
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/wqy/wqy-unibit-bdf-1.1.0-1.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=bdfb5f1b6393e6847c5337125f165418
diff --git a/metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46 b/metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46
index 8af22d906b95..3cd8470aa01e 100644
--- a/metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46
+++ b/metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46
@@ -1,5 +1,5 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font
 EAPI=7
 HOMEPAGE=http://wenq.org/wqy2/index.cgi?ZenHei
@@ -10,5 +10,5 @@ LICENSE=GPL-2-with-font-exception
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/wqy/wqy-zenhei-snapshot/0.9.46-May/wqy-zenhei-0.9.46-May.tar.bz2
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=font	0667878c2b594871023dd1833d05996f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=38694ad5b8d0bf557e2f4006d042b1e1
diff --git a/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4 b/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4
index f6bb42e610c8..3502c796a1b8 100644
--- a/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4
+++ b/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4
@@ -1,6 +1,5 @@
-BDEPEND=x11-misc/imake >=x11-apps/mkfontscale-1.2.0 x11-apps/bdftopcf
+BDEPEND=x11-misc/imake >=x11-apps/mkfontscale-1.2.0 x11-apps/bdftopcf X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=This package contains character-cell fonts for use with X
 EAPI=7
 HOMEPAGE=http://www.jmknoble.net/fonts/
@@ -10,5 +9,5 @@ KEYWORDS=~alpha amd64 ~arm ~ia64 ppc s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.pobox.com/~jmknoble/fonts/jmk-x11-fonts-3.0.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_eclasses_=font	0667878c2b594871023dd1833d05996f
 _md5_=417d820b320d8f66ff14fb6cff4d1fa3
diff --git a/metadata/md5-cache/media-fonts/zh-kcfonts-1.05-r3 b/metadata/md5-cache/media-fonts/zh-kcfonts-1.05-r3
index 6ea526d60a07..38f2d169181a 100644
--- a/metadata/md5-cache/media-fonts/zh-kcfonts-1.05-r3
+++ b/metadata/md5-cache/media-fonts/zh-kcfonts-1.05-r3
@@ -1,14 +1,14 @@
-BDEPEND=x11-apps/bdftopcf
+BDEPEND=x11-apps/bdftopcf X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Kuo Chauo Chinese Fonts collection in BIG5 encoding
 EAPI=7
 HOMEPAGE=http://freebsd.sinica.edu.tw/
+INHERIT=font toolchain-funcs
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc s390 sparc x86
 LICENSE=public-domain
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=ftp://freebsd.sinica.edu.tw/pub/distfiles/kcfonts-1.05.tar.gz ftp://wm28.csie.ncu.edu.tw/pub/distfiles/kcfonts-1.05.tar.gz https://dev.gentoo.org/~soap/distfiles/zh-kcfonts-1.05-freebsd-aa_ad.patch.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=font	0667878c2b594871023dd1833d05996f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=23220ef422914b6dec7f0ed1a1301904