2019-03-03 22:04:47 UTC

author: Repository mirror & CI <repomirrorci@gentoo.org> 2019-03-03 22:04:48 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2019-03-03 22:04:48 +0000
commit: 76e4d4cdf27980df54fe7bcba038f4617663581b (patch)
tree: 972ba8b990062c8dc7b36d227368e13872c084f8 /metadata/md5-cache/media-fonts
parent: Merge updates from master (diff)
download: gentoo-76e4d4cdf27980df54fe7bcba038f4617663581b.tar.gz
gentoo-76e4d4cdf27980df54fe7bcba038f4617663581b.tar.bz2
gentoo-76e4d4cdf27980df54fe7bcba038f4617663581b.zip
254 files changed, 541 insertions, 541 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 2567a7b0ad8d..891d06925256 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 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A sanserif typeface in the style of xkcd
 EAPI=6
 HOMEPAGE=http://antiyawn.com/uploads/humorsans.html
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://www.antiyawn.com/uploads/Humor-Sans-1.0.ttf
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a94f8d12c3103dee49cfcfd5104db0d1
diff --git a/metadata/md5-cache/media-fonts/ahem-1.0 b/metadata/md5-cache/media-fonts/ahem-1.0
index 79feb335b413..20dab971b0c5 100644
--- a/metadata/md5-cache/media-fonts/ahem-1.0
+++ b/metadata/md5-cache/media-fonts/ahem-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A font developed to help test writers develop predictable tests
 EAPI=6
 HOMEPAGE=https://github.com/Kozea/Ahem
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0f85e931e9329e2dd5c4af9ffcb3539d
diff --git a/metadata/md5-cache/media-fonts/alee-fonts-13-r1 b/metadata/md5-cache/media-fonts/alee-fonts-13-r1
index 8346b2c66ec6..df4da0e3776d 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A Lee's Hangul truetype fonts
 EAPI=6
 HOMEPAGE=https://screenshots.debian.net/package/ttf-alee
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-li
 LICENSE=Artistic
 SLOT=0
 SRC_URI=http://turul.canonical.com/pool/main/t/ttf-alee/ttf-alee_13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d8ce312157702a5a2106c131610bb2e
diff --git a/metadata/md5-cache/media-fonts/alegreya-sans-2.008 b/metadata/md5-cache/media-fonts/alegreya-sans-2.008
index 157d5946e4fa..96b93685c480 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A humanist sans-serif typeface with a calligraphic, dynamic feeling
 EAPI=6
 HOMEPAGE=https://www.huertatipografica.com/en/fonts/alegreya-sans-ht
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ff7b3936b471bb7bc254298051cbd2b6
diff --git a/metadata/md5-cache/media-fonts/alegreya-serif-2.007 b/metadata/md5-cache/media-fonts/alegreya-serif-2.007
index 7bdb8aad19ac..02bf2da2022c 100644
--- a/metadata/md5-cache/media-fonts/alegreya-serif-2.007
+++ b/metadata/md5-cache/media-fonts/alegreya-serif-2.007
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Alegreya serif type family
 EAPI=6
 HOMEPAGE=https://www.huertatipografica.com/en/fonts/alegreya-ht-pro
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/huertatipografica/Alegreya/archive/v2.007.tar.gz -> alegreya-serif-2.007.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e5a02ec03b8b439afbcb8a31bb477939
diff --git a/metadata/md5-cache/media-fonts/andika-5.000 b/metadata/md5-cache/media-fonts/andika-5.000
index 311b00bd3946..1bdf2d199639 100644
--- a/metadata/md5-cache/media-fonts/andika-5.000
+++ b/metadata/md5-cache/media-fonts/andika-5.000
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Sans-serif font designed for literacy use
 EAPI=5
 HOMEPAGE=http://scripts.sil.org/Andika
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Andika-5.000.zip&filename=Andika-5.000.zip -> andika-5.000.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9897383759c9510ed917b593a6df669c
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 faf1be1ae7fc..68a9692dd056 100644
--- a/metadata/md5-cache/media-fonts/anonymous-pro-1.002-r1
+++ b/metadata/md5-cache/media-fonts/anonymous-pro-1.002-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Monospaced truetype font designed with coding in mind
 EAPI=5
 HOMEPAGE=https://www.marksimonson.com/fonts/view/anonymous-pro
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.marksimonson.com/assets/content/fonts/AnonymousPro-1.002.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5f641fc361543cc9e282fdf5e4d9572e
diff --git a/metadata/md5-cache/media-fonts/aquafont-2.7-r4 b/metadata/md5-cache/media-fonts/aquafont-2.7-r4
index 3d421934a650..e9e87a9a9b79 100644
--- a/metadata/md5-cache/media-fonts/aquafont-2.7-r4
+++ b/metadata/md5-cache/media-fonts/aquafont-2.7-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Handwritten Japanese fixed-width TrueType font
 EAPI=0
 HOMEPAGE=http://www.geocities.jp/teardrops_in_aquablue/
@@ -9,5 +9,5 @@ LICENSE=aquafont
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://www.geocities.jp/teardrops_in_aquablue/fnt/aqua2_7.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5c264f1667b2e56549016406afca0a9e
diff --git a/metadata/md5-cache/media-fonts/aquapfont-2.6-r2 b/metadata/md5-cache/media-fonts/aquapfont-2.6-r2
index 38cca8bd1a46..55d252e4f0ef 100644
--- a/metadata/md5-cache/media-fonts/aquapfont-2.6-r2
+++ b/metadata/md5-cache/media-fonts/aquapfont-2.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Very pretty Japanese proportional truetype font
 EAPI=0
 HOMEPAGE=http://aquablue.milkcafe.to/
@@ -9,5 +9,5 @@ LICENSE=aquafont
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://aquablue.milkcafe.to/tears/font/aquap2_6.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b871c31d6322866bfa0cfb5e2abec7e
diff --git a/metadata/md5-cache/media-fonts/arabeyes-fonts-2.0 b/metadata/md5-cache/media-fonts/arabeyes-fonts-2.0
index 1ada4abe2c52..9d5bd1ab021c 100644
--- a/metadata/md5-cache/media-fonts/arabeyes-fonts-2.0
+++ b/metadata/md5-cache/media-fonts/arabeyes-fonts-2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Arabeyes Arabic TrueType fonts
 EAPI=0
 HOMEPAGE=http://www.arabeyes.org/project.php?proj=Khotot
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/arabeyes/ae_fonts_2.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fb8c1be2f8632c9f6dae61beeda9093f
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 11d94130ba8e..516c7f825575 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Arabeyes Arabic TrueType fonts
 EAPI=6
 HOMEPAGE=https://www.arabeyes.org/Khotot#2.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/arabeyes/ae_fonts_2.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1037c1f061f65a3d7c3e8603c98f5027
diff --git a/metadata/md5-cache/media-fonts/arkpandora-2.04 b/metadata/md5-cache/media-fonts/arkpandora-2.04
index ab365c1859f2..b5c24cf5e7c4 100644
--- a/metadata/md5-cache/media-fonts/arkpandora-2.04
+++ b/metadata/md5-cache/media-fonts/arkpandora-2.04
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Arkpandora MS-TTF replacement font pack
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=BitstreamVera
 SLOT=0
 SRC_URI=mirror://gentoo/ttf-arkpandora-2.04.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=72dc2fa1afb63a21dd62aa6bf9de5a69
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 0dc1ff0a0cf2..b3f3a71d40a4 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,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=media-gfx/fontforge X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=media-gfx/fontforge X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Chinese TrueType Arphic Fonts
 EAPI=5
 HOMEPAGE=http://www.arphic.com.tw/ https://www.freedesktop.org/wiki/Software/CJKUnifonts
@@ -9,5 +9,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=7c1a7f2e7dae126de01d9d2c9298ed3d
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 9f11440175a4..dd37b5620d3b 100644
--- a/metadata/md5-cache/media-fonts/artwiz-aleczapka-en-1.3
+++ b/metadata/md5-cache/media-fonts/artwiz-aleczapka-en-1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Artwiz Aleczapko fonts
 EAPI=0
 HOMEPAGE=http://artwizaleczapka.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/artwizaleczapka/artwiz-aleczapka-en-1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fd98114718581c6009780867d916c7ac
diff --git a/metadata/md5-cache/media-fonts/artwiz-latin1-1.1 b/metadata/md5-cache/media-fonts/artwiz-latin1-1.1
index 2f4f0554e886..7c4ae910d880 100644
--- a/metadata/md5-cache/media-fonts/artwiz-latin1-1.1
+++ b/metadata/md5-cache/media-fonts/artwiz-latin1-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A set of improved Artwiz fonts with bold and full ISO-8859-1 support
 EAPI=0
 HOMEPAGE=http://artwiz-latin1.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/artwiz-latin1/artwiz-latin1-1.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fc35282fe8cbe635d23af5643f65a154
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 6cb910ad4a4c..b23ebc472d6d 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,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
 DESCRIPTION=Korean Baekmuk Font
 EAPI=6
 HOMEPAGE=http://kldp.net/baekmuk/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://kldp.net/baekmuk/release/865-baekmuk-bdf-2.2.tar.gz -> baekmuk-bdf-2.2.tar.gz http://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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f8b694505f1d2bceb2dcb7c87386c401
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 d31450a8ac55..ff268d99525c 100644
--- a/metadata/md5-cache/media-fonts/bitstream-cyberbit-2.0-r2
+++ b/metadata/md5-cache/media-fonts/bitstream-cyberbit-2.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Cyberbit Unicode (including CJK) font
 EAPI=6
 HOMEPAGE=http://www.bitstream.com/
@@ -9,5 +9,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b78033ca9707073b142d8bdff457a7be
diff --git a/metadata/md5-cache/media-fonts/cantarell-0.101 b/metadata/md5-cache/media-fonts/cantarell-0.101
index 1df4455ab2a3..a06b09b6a5ab 100644
--- a/metadata/md5-cache/media-fonts/cantarell-0.101
+++ b/metadata/md5-cache/media-fonts/cantarell-0.101
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig X? ( x11-apps/mkfontdir media-fonts/encodings ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEPEND=dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
 DESCRIPTION=Default fontset for GNOME Shell
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/CantarellFonts
@@ -10,5 +10,5 @@ RDEPEND=media-libs/fontconfig
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/cantarell-fonts/0.101/cantarell-fonts-0.101.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	3c3f61163f786eebdbd8ad4f1e24ab7c	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	3c3f61163f786eebdbd8ad4f1e24ab7c	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3e16bdff3ec29f3191d046928c130768
diff --git a/metadata/md5-cache/media-fonts/cantarell-0.111 b/metadata/md5-cache/media-fonts/cantarell-0.111
index 310c96b24d56..ac739291119e 100644
--- a/metadata/md5-cache/media-fonts/cantarell-0.111
+++ b/metadata/md5-cache/media-fonts/cantarell-0.111
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig X? ( x11-apps/mkfontdir media-fonts/encodings ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEPEND=dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
 DESCRIPTION=Default fontset for GNOME Shell
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/CantarellFonts
@@ -10,5 +10,5 @@ RDEPEND=media-libs/fontconfig
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/cantarell-fonts/0.111/cantarell-fonts-0.111.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	3c3f61163f786eebdbd8ad4f1e24ab7c	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	3c3f61163f786eebdbd8ad4f1e24ab7c	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=0ca4ad2920e02560be9d76242119078f
diff --git a/metadata/md5-cache/media-fonts/cardo-1.04 b/metadata/md5-cache/media-fonts/cardo-1.04
index 29e1450d7fbe..a7c6fc971ba1 100644
--- a/metadata/md5-cache/media-fonts/cardo-1.04
+++ b/metadata/md5-cache/media-fonts/cardo-1.04
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Unicode font for classicists, medievalists and linguists
 EAPI=0
 HOMEPAGE=http://scholarsfonts.net/cardofnt.html
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://scholarsfonts.net/cardo104.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=380d528eb4d11fb23c5802e30f62ae9a
diff --git a/metadata/md5-cache/media-fonts/cheapskatefonts-1.0 b/metadata/md5-cache/media-fonts/cheapskatefonts-1.0
index 253eb04afdfe..2481cbfe9ac1 100644
--- a/metadata/md5-cache/media-fonts/cheapskatefonts-1.0
+++ b/metadata/md5-cache/media-fonts/cheapskatefonts-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Dustismo's decorative font collection
 EAPI=0
 HOMEPAGE=http://www.dustismo.com/site/fonts.html
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~x86-fbsd
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c5523088ae0582b3ccdc373af1b8d2cc
diff --git a/metadata/md5-cache/media-fonts/clearsans-1.00 b/metadata/md5-cache/media-fonts/clearsans-1.00
index ab9853237726..b52b00725c4a 100644
--- a/metadata/md5-cache/media-fonts/clearsans-1.00
+++ b/metadata/md5-cache/media-fonts/clearsans-1.00
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=OpenType font optimized for readability on small screens
 EAPI=6
 HOMEPAGE=https://01.org/clear-sans
@@ -9,5 +9,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=623baf6158ee6751304fd786cd082122
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 327c6aee0a4d..205512bba8c3 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Computer Modern Unicode fonts
 EAPI=6
 HOMEPAGE=http://cm-unicode.sourceforge.net/
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=916629bd6bee783e8c3cc0a5a87b17a6
diff --git a/metadata/md5-cache/media-fonts/comic-neue-2.2 b/metadata/md5-cache/media-fonts/comic-neue-2.2
index 84355fa1cc5b..870a45ba1b9f 100644
--- a/metadata/md5-cache/media-fonts/comic-neue-2.2
+++ b/metadata/md5-cache/media-fonts/comic-neue-2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Typographically savvy casual script typeface
 EAPI=5
 HOMEPAGE=http://comicneue.com/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~mips
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://comicneue.com/comic-neue-2.2.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bb7a3b9f3d47c1c12b638e78dd29e4f0
diff --git a/metadata/md5-cache/media-fonts/comic-neue-2.3 b/metadata/md5-cache/media-fonts/comic-neue-2.3
index f0179a0c6871..e63cd497950b 100644
--- a/metadata/md5-cache/media-fonts/comic-neue-2.3
+++ b/metadata/md5-cache/media-fonts/comic-neue-2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Typographically savvy casual script typeface
 EAPI=6
 HOMEPAGE=http://comicneue.com
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://comicneue.com/comic-neue-2.3.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=833781b3270a235f181f5acc44998ad7
diff --git a/metadata/md5-cache/media-fonts/corefonts-1-r7 b/metadata/md5-cache/media-fonts/corefonts-1-r7
index 1af5f2b783e3..35b56db46fde 100644
--- a/metadata/md5-cache/media-fonts/corefonts-1-r7
+++ b/metadata/md5-cache/media-fonts/corefonts-1-r7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=app-arch/cabextract X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/cabextract X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Microsoft's TrueType core fonts
 EAPI=5
 HOMEPAGE=http://corefonts.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~a
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a382b53e6d6b434d1f54d53b3f595c52
diff --git a/metadata/md5-cache/media-fonts/courier-prime-1.203 b/metadata/md5-cache/media-fonts/courier-prime-1.203
index f822c770a6ae..1e9b7201ca7b 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A redesign of Courier
 EAPI=5
 HOMEPAGE=https://www.quoteunquoteapps.com/courierprime/
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8ed168a1d027744e9e5f5dec6f2ed640
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 41dc82e9a668..a29912337e53 100644
--- a/metadata/md5-cache/media-fonts/cronyx-fonts-2.3.8
+++ b/metadata/md5-cache/media-fonts/cronyx-fonts-2.3.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
 DESCRIPTION=Cronyx Cyrillic bitmap fonts for X
 EAPI=5
 HOMEPAGE=http://packages.debian.org/source/sid/xfonts-cronyx
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=freedist
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=30569e8062fc55534207d58a6f73df07
diff --git a/metadata/md5-cache/media-fonts/croscorefonts-1.23.0 b/metadata/md5-cache/media-fonts/croscorefonts-1.23.0
index 2768f6b3ca8f..48115cf940f7 100644
--- a/metadata/md5-cache/media-fonts/croscorefonts-1.23.0
+++ b/metadata/md5-cache/media-fonts/croscorefonts-1.23.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Open licensed fonts metrically compatible with MS corefonts
 EAPI=5
 HOMEPAGE=https://www.google.com/webfonts/specimen/Arimo https://www.google.com/webfonts/specimen/Cousine https://www.google.com/webfonts/specimen/Tinos
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/croscorefonts-1.23.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=585d2ab9a9a79a351e7ccf032b1d73f8
diff --git a/metadata/md5-cache/media-fonts/croscorefonts-1.31.0 b/metadata/md5-cache/media-fonts/croscorefonts-1.31.0
index 4ccde897cf17..ea9819df95ee 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Open licensed fonts metrically compatible with MS corefonts
 EAPI=6
 HOMEPAGE=https://www.google.com/webfonts/specimen/Arimo https://www.google.com/webfonts/specimen/Cousine https://www.google.com/webfonts/specimen/Tinos
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/croscorefonts-1.31.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ac7e24e4e0a97d1df47a4609f9c476e9
diff --git a/metadata/md5-cache/media-fonts/crosextrafonts-caladea-20130214 b/metadata/md5-cache/media-fonts/crosextrafonts-caladea-20130214
index 4b3da3851616..f061628c1c61 100644
--- a/metadata/md5-cache/media-fonts/crosextrafonts-caladea-20130214
+++ b/metadata/md5-cache/media-fonts/crosextrafonts-caladea-20130214
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Open licensed serif font metrically compatible with Cambria
 EAPI=6
 HOMEPAGE=https://bugs.chromium.org/p/chromium/issues/detail?id=168879
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-20130214.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=be27e6362d58ce5bbd43c9fd07b4bd58
diff --git a/metadata/md5-cache/media-fonts/crosextrafonts-carlito-20130920 b/metadata/md5-cache/media-fonts/crosextrafonts-carlito-20130920
index 4c88893b0254..fcab3bfa04c9 100644
--- a/metadata/md5-cache/media-fonts/crosextrafonts-carlito-20130920
+++ b/metadata/md5-cache/media-fonts/crosextrafonts-carlito-20130920
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Open licensed sans-serif font metrically compatible with Calibri
 EAPI=6
 HOMEPAGE=http://code.google.com/p/chromium/issues/detail?id=280557
@@ -9,5 +9,5 @@ LICENSE=OFL
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-20130920.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=469d7579305e0ae49bccf738e4a68a5c
diff --git a/metadata/md5-cache/media-fonts/culmus-0.120-r4 b/metadata/md5-cache/media-fonts/culmus-0.120-r4
index fce45119f98a..02b55e3cce89 100644
--- a/metadata/md5-cache/media-fonts/culmus-0.120-r4
+++ b/metadata/md5-cache/media-fonts/culmus-0.120-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup unpack
-DEPEND=!media-fonts/culmus-ancient >=x11-apps/mkfontscale-1.0.9-r1 fontforge? ( media-gfx/fontforge ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!media-fonts/culmus-ancient >=x11-apps/mkfontscale-1.0.9-r1 fontforge? ( media-gfx/fontforge ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Hebrew Type1 fonts
 EAPI=2
 HOMEPAGE=http://culmus.sourceforge.net/
@@ -9,5 +9,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.120.tar.gz mirror://sourceforge/culmus/culmus-type1-0.105.tar.gz fontforge? ( mirror://sourceforge/culmus/culmus-src-0.120.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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1ee0af42608be38ad0e9f64059185f50
diff --git a/metadata/md5-cache/media-fonts/dejavu-2.35 b/metadata/md5-cache/media-fonts/dejavu-2.35
index ba5bc4ff85b2..a634a7122e3f 100644
--- a/metadata/md5-cache/media-fonts/dejavu-2.35
+++ b/metadata/md5-cache/media-fonts/dejavu-2.35
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=fontforge? ( x11-apps/mkfontscale >=media-gfx/fontforge-20080429 x11-apps/mkfontdir dev-perl/Font-TTF app-i18n/unicode-data >media-libs/fontconfig-2.6.0 ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=fontforge? ( x11-apps/mkfontscale >=media-gfx/fontforge-20080429 x11-apps/mkfontdir dev-perl/Font-TTF app-i18n/unicode-data >media-libs/fontconfig-2.6.0 ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=DejaVu fonts, bitstream vera with ISO-8859-2 characters
 EAPI=5
 HOMEPAGE=https://dejavu-fonts.github.io/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~a
 LICENSE=BitstreamVera
 SLOT=0
 SRC_URI=!fontforge? ( mirror://sourceforge/dejavu/dejavu-fonts-ttf-2.35.tar.bz2 ) fontforge? ( mirror://sourceforge/dejavu/dejavu-fonts-2.35.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=56f8f1f46a35e0062570e10abb841d0c
diff --git a/metadata/md5-cache/media-fonts/dejavu-2.37 b/metadata/md5-cache/media-fonts/dejavu-2.37
index 888edc2280e1..6aa681108b11 100644
--- a/metadata/md5-cache/media-fonts/dejavu-2.37
+++ b/metadata/md5-cache/media-fonts/dejavu-2.37
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup unpack
-DEPEND=fontforge? ( x11-apps/mkfontscale >=media-gfx/fontforge-20080429 x11-apps/mkfontdir dev-perl/Font-TTF app-i18n/unicode-data >media-libs/fontconfig-2.6.0:1.0 ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=fontforge? ( x11-apps/mkfontscale >=media-gfx/fontforge-20080429 x11-apps/mkfontdir dev-perl/Font-TTF app-i18n/unicode-data >media-libs/fontconfig-2.6.0:1.0 ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=DejaVu fonts, bitstream vera with ISO-8859-2 characters
 EAPI=6
 HOMEPAGE=https://dejavu-fonts.github.io/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~am
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=2c8e43d10eb99ceb9ce5341b158c0575
diff --git a/metadata/md5-cache/media-fonts/dina-2.89 b/metadata/md5-cache/media-fonts/dina-2.89
index 12f8cc133e74..169e26b99926 100644
--- a/metadata/md5-cache/media-fonts/dina-2.89
+++ b/metadata/md5-cache/media-fonts/dina-2.89
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A monospace bitmap font, primarily aimed at programmers
 EAPI=0
 HOMEPAGE=http://www.donationcoder.com/Software/Jibz/Dina/index.html
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=Dina
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/dina-pcf-2.89.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=059673d1ef24c8fc58271fa4d4b50d05
diff --git a/metadata/md5-cache/media-fonts/dina-2.93 b/metadata/md5-cache/media-fonts/dina-2.93
index 5f2d88fdbc00..f9748cd97915 100644
--- a/metadata/md5-cache/media-fonts/dina-2.93
+++ b/metadata/md5-cache/media-fonts/dina-2.93
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
 DESCRIPTION=A monospace bitmap font, primarily aimed at programmers
 EAPI=6
 HOMEPAGE=http://www.donationcoder.com/Software/Jibz/Dina/index.html
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://www.donationcoder.com/forum/index.php?action=dlattach;topic=36049.0;attach=78562 -> dina-2.93.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5b465e9a9c8eabb96fa873e7e86ee3c7
diff --git a/metadata/md5-cache/media-fonts/droid-113-r5 b/metadata/md5-cache/media-fonts/droid-113-r5
index 9102201c9a4d..b62d3012b943 100644
--- a/metadata/md5-cache/media-fonts/droid-113-r5
+++ b/metadata/md5-cache/media-fonts/droid-113-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Font family from Google's Android project
 EAPI=6
 HOMEPAGE=https://code.google.com/android/RELEASENOTES.html http://www.cosmix.org/software/
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=87cc59fe9e588e1777d1087267797f9b
diff --git a/metadata/md5-cache/media-fonts/dzongkha-fonts-2009.09 b/metadata/md5-cache/media-fonts/dzongkha-fonts-2009.09
index 8e6577067cd5..adc3d22977fc 100644
--- a/metadata/md5-cache/media-fonts/dzongkha-fonts-2009.09
+++ b/metadata/md5-cache/media-fonts/dzongkha-fonts-2009.09
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Bhutanese/Tibetan fonts for dzongkha script provided by the Bhutanese government
 EAPI=5
 HOMEPAGE=http://www.dit.gov.bt/downloads
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=freedist
 SLOT=0
 SRC_URI=http://www.dit.gov.bt/sites/default/files/dzongkhafonts.zip -> dzongkha-fonts-2009.09.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=70e8996d045f258f8c4a28aef6c8034b
diff --git a/metadata/md5-cache/media-fonts/eb-garamond-0.016 b/metadata/md5-cache/media-fonts/eb-garamond-0.016
index 2fba433c37f2..e47add580a81 100644
--- a/metadata/md5-cache/media-fonts/eb-garamond-0.016
+++ b/metadata/md5-cache/media-fonts/eb-garamond-0.016
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Claude Garamont's humanist typeface from the mid-16th century
 EAPI=5
 HOMEPAGE=http://www.georgduffner.at/ebgaramond/
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b47fcc8e2b7d44dd83de3630936ad89
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 c201f8a10986..3cfa19cda8e5 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,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
 DESCRIPTION=The /efont/ Unicode Bitmap Fonts
 EAPI=0
 HOMEPAGE=http://openlab.jp/efont/unicode/
@@ -9,5 +9,5 @@ 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c8fd8dfc1d56cbd83fc3fd6d207b3bfc
diff --git a/metadata/md5-cache/media-fonts/ekushey-bangla-fonts-20070420 b/metadata/md5-cache/media-fonts/ekushey-bangla-fonts-20070420
index f27c084cd5f6..9aed088944a5 100644
--- a/metadata/md5-cache/media-fonts/ekushey-bangla-fonts-20070420
+++ b/metadata/md5-cache/media-fonts/ekushey-bangla-fonts-20070420
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A collection of Free fonts for the Bangla (Bengali) script
 EAPI=0
 HOMEPAGE=http://ekushey.org/index.php/page/otf_bangla_fonts
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2 OFL-1.1
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a60bf5356ae666f7edaa16db34bdfdae
diff --git a/metadata/md5-cache/media-fonts/encodings-1.0.4-r3 b/metadata/md5-cache/media-fonts/encodings-1.0.4-r3
index 2adcb404dd2b..36cf00b08b49 100644
--- a/metadata/md5-cache/media-fonts/encodings-1.0.4-r3
+++ b/metadata/md5-cache/media-fonts/encodings-1.0.4-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 X? ( x11-apps/mkfontdir media-fonts/encodings ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DESCRIPTION=X.Org font encodings
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/encodings-1.0.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=b39479f06a0f547d61d987b34a056ca2
diff --git a/metadata/md5-cache/media-fonts/essays1743-2.000 b/metadata/md5-cache/media-fonts/essays1743-2.000
index 44ee3a76a267..aef04e4db2c2 100644
--- a/metadata/md5-cache/media-fonts/essays1743-2.000
+++ b/metadata/md5-cache/media-fonts/essays1743-2.000
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=John Stracke's Essays 1743 font
 EAPI=6
 HOMEPAGE=https://www.thibault.org/fonts/essays/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd
 LICENSE=|| ( LGPL-2.1 OFL-1.1 )
 SLOT=0
 SRC_URI=https://www.thibault.org/fonts/essays/essays1743-2.000-1-ttf.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6015103fb4214edbc38cc5d1fcb99095
diff --git a/metadata/md5-cache/media-fonts/essays1743-2.001 b/metadata/md5-cache/media-fonts/essays1743-2.001
index 070c007de00d..ce756a2360b5 100644
--- a/metadata/md5-cache/media-fonts/essays1743-2.001
+++ b/metadata/md5-cache/media-fonts/essays1743-2.001
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=John Stracke's Essays 1743 font
 EAPI=6
 HOMEPAGE=https://www.thibault.org/fonts/essays/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x6
 LICENSE=|| ( LGPL-2.1 OFL-1.1 )
 SLOT=0
 SRC_URI=https://www.thibault.org/fonts/essays/essays1743-2.001-1-ttf.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f26882d6a842873d41f9749b1d002700
diff --git a/metadata/md5-cache/media-fonts/exljbris-free-20100320 b/metadata/md5-cache/media-fonts/exljbris-free-20100320
index 6d0887f7ed14..cd5effb9722b 100644
--- a/metadata/md5-cache/media-fonts/exljbris-free-20100320
+++ b/metadata/md5-cache/media-fonts/exljbris-free-20100320
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Beautiful free fonts from exljbris Font Foundry
 EAPI=0
 HOMEPAGE=http://www.josbuivenga.demon.nl/
@@ -9,5 +9,5 @@ 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2166a2be3a75c81875ff4df9445a8c22
diff --git a/metadata/md5-cache/media-fonts/exo-2 b/metadata/md5-cache/media-fonts/exo-2
index 131f3769f01c..edc456a64584 100644
--- a/metadata/md5-cache/media-fonts/exo-2
+++ b/metadata/md5-cache/media-fonts/exo-2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A geometric sans-serif font with a technological feel
 EAPI=5
 HOMEPAGE=http://ndiscovered.com/exo-2/
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4cdd8f9bab7eff08f9946348544455da
diff --git a/metadata/md5-cache/media-fonts/fantasque-sans-mono-2014.07 b/metadata/md5-cache/media-fonts/fantasque-sans-mono-2014.07
index 884c30013990..48878f850a46 100644
--- a/metadata/md5-cache/media-fonts/fantasque-sans-mono-2014.07
+++ b/metadata/md5-cache/media-fonts/fantasque-sans-mono-2014.07
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Functional programming font designed with some handwriting-like fuzziness
 EAPI=5
 HOMEPAGE=http://openfontlibrary.org/en/font/fantasque-sans-mono
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://openfontlibrary.org/assets/downloads/fantasque-sans-mono/db52617ba875d08cbd8e080ca3d9f756/fantasque-sans-mono.zip -> fantasque-sans-mono-2014.07.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7a87758f7049275b2c68713d1f12e443
diff --git a/metadata/md5-cache/media-fonts/farsi-fonts-0.4 b/metadata/md5-cache/media-fonts/farsi-fonts-0.4
index 6e39d33df30e..7bea61e4bad0 100644
--- a/metadata/md5-cache/media-fonts/farsi-fonts-0.4
+++ b/metadata/md5-cache/media-fonts/farsi-fonts-0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Farsi (Persian) Unicode fonts
 EAPI=0
 HOMEPAGE=http://www.farsiweb.ir/wiki/Products/PersianFonts
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.farsiweb.ir/font/farsifonts-0.4.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=96939d48754709430a2ae3e6f880baeb
diff --git a/metadata/md5-cache/media-fonts/fgdc-emergency-2.20 b/metadata/md5-cache/media-fonts/fgdc-emergency-2.20
index 73745419a3d6..4db3a1707a2d 100644
--- a/metadata/md5-cache/media-fonts/fgdc-emergency-2.20
+++ b/metadata/md5-cache/media-fonts/fgdc-emergency-2.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=FGDC Emergency Response Symbology Prototype
 EAPI=0
 HOMEPAGE=http://www.fgdc.gov/HSWG/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.fgdc.gov/HSWG/symbol_downloads/ers_v220.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0eb8e6d906631450ecab6d36285b327d
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 76f6267e6cb4..6d01c7fb479d 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Simplistic, technical sans serif - openSUSE font
 EAPI=6
 HOMEPAGE=http://jimmac.musichall.cz/log/?p=439
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	obs-download	dee642b7a40967b3fee1c026a6ba33dd	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	obs-download	dee642b7a40967b3fee1c026a6ba33dd	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=891582ad2b704d41a56f6f484748a988
diff --git a/metadata/md5-cache/media-fonts/fira-code-1.205 b/metadata/md5-cache/media-fonts/fira-code-1.205
index 9971dc3e76a9..b02663b09f88 100644
--- a/metadata/md5-cache/media-fonts/fira-code-1.205
+++ b/metadata/md5-cache/media-fonts/fira-code-1.205
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Monospaced font with programming ligatures
 EAPI=6
 HOMEPAGE=https://github.com/tonsky/FiraCode
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/tonsky/FiraCode/archive/1.205.tar.gz -> fira-code-1.205.tar.gz https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0e6503823f5c8e967d3b023f6366d8af
diff --git a/metadata/md5-cache/media-fonts/fira-code-1.206 b/metadata/md5-cache/media-fonts/fira-code-1.206
index 7f13fe280b57..2c6c139bcf7a 100644
--- a/metadata/md5-cache/media-fonts/fira-code-1.206
+++ b/metadata/md5-cache/media-fonts/fira-code-1.206
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Monospaced font with programming ligatures
 EAPI=6
 HOMEPAGE=https://github.com/tonsky/FiraCode
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/tonsky/FiraCode/archive/1.206.tar.gz -> fira-code-1.206.tar.gz https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9331d9be6f53241dbc30276291795fb4
diff --git a/metadata/md5-cache/media-fonts/fira-mono-3.205 b/metadata/md5-cache/media-fonts/fira-mono-3.205
index de386a3a890a..b11bb6c70890 100644
--- a/metadata/md5-cache/media-fonts/fira-mono-3.205
+++ b/metadata/md5-cache/media-fonts/fira-mono-3.205
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Default monospaced typeface for FirefoxOS, designed for legibility
 EAPI=5
 HOMEPAGE=http://www.carrois.com/fira-4-1/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3205.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8b08d8c70d840c188dd22aa2aa37c1b2
diff --git a/metadata/md5-cache/media-fonts/fira-sans-4.002 b/metadata/md5-cache/media-fonts/fira-sans-4.002
index 98dc1a88b4ea..a011bfd40dd4 100644
--- a/metadata/md5-cache/media-fonts/fira-sans-4.002
+++ b/metadata/md5-cache/media-fonts/fira-sans-4.002
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Default typeface for FirefoxOS, designed for legibility
 EAPI=5
 HOMEPAGE=http://www.carrois.com/fira-4-0/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://www.carrois.com/downloads/fira_4_0/FiraFonts4002.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=98fe264138df3903558891613c8e3e18
diff --git a/metadata/md5-cache/media-fonts/fira-sans-4.105 b/metadata/md5-cache/media-fonts/fira-sans-4.105
index f9d719af463a..8345c4d41c69 100644
--- a/metadata/md5-cache/media-fonts/fira-sans-4.105
+++ b/metadata/md5-cache/media-fonts/fira-sans-4.105
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Default typeface for FirefoxOS, designed for legibility
 EAPI=5
 HOMEPAGE=http://www.carrois.com/fira-4-0/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://www.carrois.com/downloads/fira_4_1/FiraFonts4105.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=bb0a0cc744109573f44498ce515742d1
diff --git a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r1
index e317b5b8fc0c..5ded6d14060d 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Adobe bitmap fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=c9778be04cc35d96a5d627468e7a1f01
diff --git a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r1
index 87bc1f2be675..a1f30511e513 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Adobe bitmap fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=c9778be04cc35d96a5d627468e7a1f01
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r1
index 046108f43761..de6fcef1a0cf 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r1
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Adobe Utopia bitmap fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=ae3a4166bc247d9480eb7696a3672545
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r1
index 4940a9a26d45..b16b5fef823a 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r1
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Adobe Utopia bitmap fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=ae3a4166bc247d9480eb7696a3672545
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r1
index 5c1072120ad0..3235eda20c8d 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r1
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Adobe Utopia Type 1 fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=27ea037cdd2342eab9385b690f8102c7
diff --git a/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1
index 754b3e517658..75e554e5e37e 100644
--- a/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-alias-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=5b95d0dadf3756149137da7a2097b39d
diff --git a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r1
index 95fbf67e80f8..9dbfdfbddb23 100644
--- a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org arabic bitmap fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-arabic-misc-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=5d5856229e28e2012c0307faea9b3620
diff --git a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r1
index c300d24fa17d..7a0d26ef72ec 100644
--- a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bigelow & Holmes bitmap fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=4f1cba397fed8685f47a64d5a903fe1f
diff --git a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r1
index 8c14c963c757..305bf67f52fe 100644
--- a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bigelow & Holmes bitmap fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=4f1cba397fed8685f47a64d5a903fe1f
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r1
index 278c2052d57b..c422321ddf54 100644
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bigelow & Holmes Lucida bitmap fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=2bf40844b7d05a86a34416fca354fc4d
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r1
index c33ab2d274a7..369617b353a7 100644
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bigelow & Holmes Lucida bitmap fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=2bf40844b7d05a86a34416fca354fc4d
diff --git a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r1
index 97a390cce1a3..642cc7cbb4a9 100644
--- a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bigelow & Holmes TrueType fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=bh-luxi
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-ttf-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=4d614eb148a230527c800a374dd39fa4
diff --git a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r1
index f0b35d8c174a..9c060ad7c703 100644
--- a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bigelow & Holmes Type 1 fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=bh-luxi
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-type1-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=d8d89f97a245d4600547bfb9102d93b5
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r1
index d4b936b4433e..b2f459d8361e 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bitstream bitmap fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=35f8527c27be150e2c5775409938e4a9
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r1
index a2b481780c2e..e9a787702549 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bitstream bitmap fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=35f8527c27be150e2c5775409938e4a9
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r1 b/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r1
index 55c7635c088c..7ca02da9fca6 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r1
+++ b/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=Bitstream Speedo fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-speedo-1.0.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=72a43958323d8b975fc67008a57fe9bf
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r1
index f9a07767ddcd..340e4661440a 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Bitstream Type 1 fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-type1-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=15be60cc60dc5b3c524a2573a4aa994d
diff --git a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r1
index 80cb843a1711..dbe829592266 100644
--- a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Cronyx cyrillic fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=a95b219b38cc075b7675e179d5c34abd
diff --git a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r1
index 5c747a2315f8..375079638add 100644
--- a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org cursor font
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-cursor-misc-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=957b1b387908a6e58f9ea2eeb0dabb8c
diff --git a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r1
index 4786d8caec52..547d4dfda629 100644
--- a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Daewoo fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-daewoo-misc-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=f0a9a4a1a9d0b69ce99ef4a22df3751b
diff --git a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r1
index 96e63fd2f861..bae3ac71744c 100644
--- a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org DEC fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-dec-misc-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=cc1f978a048d1cf7b922b41f17a028b7
diff --git a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r1
index 45f6e5a74fd9..40d09b7dc9ca 100644
--- a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org IBM Courier font
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-ibm-type1-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=5f7cf564581cd91db3d6c3c1c63ca30e
diff --git a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r1
index 6f3b82b2ba2c..6ec36b27950b 100644
--- a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org the Institute of Software, Academia Sinica (chinese) fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-isas-misc-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=7a2f15a9ad1a0dc39f717eaaec98702a
diff --git a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r1
index 1a1dd4bdc7dd..030fb7aa8a51 100644
--- a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org JIS (japanese) fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-jis-misc-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=50ea35f313dafa4c76c66bf99c2703cd
diff --git a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r1
index 25160501d57b..018fdc881202 100644
--- a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org micro-misc font
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-micro-misc-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=15489ae434af97dc3880acbbcb962e89
diff --git a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r1
index 86ece5d64f53..9ddfa3aca267 100644
--- a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org misc-cyrillic fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-cyrillic-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=c51f40553ff944dedd6563e30bc4a7bf
diff --git a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3-r1
index ec0a7db0122f..309372eef060 100644
--- a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=Miscellaneous Ethiopic fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-ethiopic-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=1a81dc5e787a12080eb3021e6bc9ce38
diff --git a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r1
index da873e70ebf7..4adb74f63e03 100644
--- a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Syriac fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-meltho-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=34787c514e875ff3fb5d00e349193aa7
diff --git a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r1 b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r1
index 481e29cc65e8..dbcfd90002c4 100644
--- a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r1
+++ b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org miscellaneous fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-misc-1.1.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=5b901873cd87ea80293959cf222c09d9
diff --git a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r1
index b32f83ea8142..6d784473a968 100644
--- a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org ClearlyU fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-mutt-misc-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=764bfe5c3acbe9c8f3ad34cf6356ce9b
diff --git a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r1 b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r1
index 606dc37496ef..40bef4239074 100644
--- a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r1
+++ b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Schumacher fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-schumacher-misc-1.1.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=6372bb65b6e558bd35f345120deebcbb
diff --git a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r1
index c49ef4fa64ee..0872f9d6382b 100644
--- a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r1
+++ b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Screen cyrillic fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-screen-cyrillic-1.0.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=ff79ae1084e48d16de742917574ecc5c
diff --git a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r1
index e9cac608687d..6bc51c43f251 100644
--- a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Sony fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-sony-misc-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=d773b56607759eb5dfa1acc1da0b3f40
diff --git a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r1
index a4310829156c..0fc89e15ec8c 100644
--- a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Sun fonts
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-sun-misc-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=07de938c9de126cc5c0614ad839a1514
diff --git a/metadata/md5-cache/media-fonts/font-util-1.3.1 b/metadata/md5-cache/media-fonts/font-util-1.3.1
index c947a80c60cb..4efb82bd5fd5 100644
--- a/metadata/md5-cache/media-fonts/font-util-1.3.1
+++ b/metadata/md5-cache/media-fonts/font-util-1.3.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-util-1.3.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=95ac17896d46d281c34714e7ab3aff9c
diff --git a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r1
index 9b4566822dc5..be150197b269 100644
--- a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r1
+++ b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org Winitzki cyrillic font
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X nls
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=ae25c08e35c2c433d1eb6209735e7ce6
diff --git a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r1
index 4738a74ff89b..057a41dbacd7 100644
--- a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r1
+++ b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( x11-apps/mkfontdir media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 virtual/pkgconfig
 DESCRIPTION=X.Org XFree86 Type 1 font
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
@@ -7,8 +7,8 @@ IUSE=X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
+RDEPEND=media-fonts/encodings || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-xfree86-type1-1.0.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	789e64a99605aaa5f262b4f20f0e1bcb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	7bedd4ed8a6f8088db7e0f1886e93dd3
 _md5_=20659721c703946c77399a98914f72c3
diff --git a/metadata/md5-cache/media-fonts/fontawesome-4.7.0 b/metadata/md5-cache/media-fonts/fontawesome-4.7.0
index bb60d80e435d..e3dd22580198 100644
--- a/metadata/md5-cache/media-fonts/fontawesome-4.7.0
+++ b/metadata/md5-cache/media-fonts/fontawesome-4.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The iconic font
 EAPI=6
 HOMEPAGE=http://fontawesome.io
@@ -9,5 +9,5 @@ LICENSE=CC-BY-3.0 OFL-1.1
 REQUIRED_USE=|| ( otf ttf )
 SLOT=0/4
 SRC_URI=https://github.com/FortAwesome/Font-Awesome/archive/v4.7.0.tar.gz -> fontawesome-4.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ed2c4eb0196a6f84bafe10c00b0a5d95
diff --git a/metadata/md5-cache/media-fonts/fontawesome-5.0.6 b/metadata/md5-cache/media-fonts/fontawesome-5.0.6
index 2e4e833aa0f8..2bf860998559 100644
--- a/metadata/md5-cache/media-fonts/fontawesome-5.0.6
+++ b/metadata/md5-cache/media-fonts/fontawesome-5.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The iconic font
 EAPI=6
 HOMEPAGE=https://fontawesome.com
@@ -9,5 +9,5 @@ LICENSE=CC-BY-3.0 OFL-1.1
 REQUIRED_USE=|| ( otf ttf )
 SLOT=0/5
 SRC_URI=https://use.fontawesome.com/releases/v5.0.6/fontawesome-free-5.0.6.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6d2e50637e5839bf0990914e28f2e430
diff --git a/metadata/md5-cache/media-fonts/fontawesome-5.1.0 b/metadata/md5-cache/media-fonts/fontawesome-5.1.0
index 4454c973521b..7e937a4c13e9 100644
--- a/metadata/md5-cache/media-fonts/fontawesome-5.1.0
+++ b/metadata/md5-cache/media-fonts/fontawesome-5.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The iconic font
 EAPI=6
 HOMEPAGE=https://fontawesome.com
@@ -9,5 +9,5 @@ LICENSE=CC-BY-3.0 OFL-1.1
 REQUIRED_USE=|| ( otf ttf )
 SLOT=0/5
 SRC_URI=https://github.com/FortAwesome/Font-Awesome/archive/5.1.0.tar.gz -> fontawesome-5.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=548336358b139f16d1b732241abda1dd
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 1f0a64d39a89..f8e897e2a40d 100644
--- a/metadata/md5-cache/media-fonts/free-bangla-font-0.2
+++ b/metadata/md5-cache/media-fonts/free-bangla-font-0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Unicode compliant Open Type Bangla fonts
 EAPI=0
 HOMEPAGE=http://www.nongnu.org/freebangfont/index.html
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ia64 ppc s390 sh x86 ~x86-fbsd
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6b783b3f3aacdf3945987bfb3579beb8
diff --git a/metadata/md5-cache/media-fonts/freefont-20120503 b/metadata/md5-cache/media-fonts/freefont-20120503
index 6bd2316f1222..35ba8cf4f42d 100644
--- a/metadata/md5-cache/media-fonts/freefont-20120503
+++ b/metadata/md5-cache/media-fonts/freefont-20120503
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=OpenType and TrueType Unicode fonts from the Free UCS Outline Fonts Project
 EAPI=5
 HOMEPAGE=https://savannah.nongnu.org/projects/freefont/
@@ -9,5 +9,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=98125d9a319c948e17a767c4fb7438d3
diff --git a/metadata/md5-cache/media-fonts/freefonts-0.10-r3 b/metadata/md5-cache/media-fonts/freefonts-0.10-r3
index 76bebdc21d58..d48c36b875e4 100644
--- a/metadata/md5-cache/media-fonts/freefonts-0.10-r3
+++ b/metadata/md5-cache/media-fonts/freefonts-0.10-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A Collection of Free Type1 Fonts
 EAPI=0
 HOMEPAGE=http://www.gimp.org
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux
 LICENSE=freedist
 SLOT=0
 SRC_URI=mirror://gimp/fonts/freefonts-0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fe9643652448c0c5d2450e5bc745af71
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 17f91414b739..ecaaa82c3bc3 100644
--- a/metadata/md5-cache/media-fonts/fs-fonts-0.1_alpha3
+++ b/metadata/md5-cache/media-fonts/fs-fonts-0.1_alpha3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Japanese TrueType fonts designed for screen and print
 EAPI=0
 HOMEPAGE=http://x-tt.sourceforge.jp/fs_fonts/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/x-tt/7862/fs-fonts-0.1test3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3f79a829c7616439f4bd2d34746eed7c
diff --git a/metadata/md5-cache/media-fonts/gidole-2.0.2 b/metadata/md5-cache/media-fonts/gidole-2.0.2
index 4523acf53117..99f7b276a72e 100644
--- a/metadata/md5-cache/media-fonts/gidole-2.0.2
+++ b/metadata/md5-cache/media-fonts/gidole-2.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Open source modern DIN fonts
 EAPI=5
 HOMEPAGE=http://gidole.github.io/
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8aec401f733e5d56d916b5c5c368bc92
diff --git a/metadata/md5-cache/media-fonts/glass-tty-vt220-001.3 b/metadata/md5-cache/media-fonts/glass-tty-vt220-001.3
index 848277da8479..936a9573bd13 100644
--- a/metadata/md5-cache/media-fonts/glass-tty-vt220-001.3
+++ b/metadata/md5-cache/media-fonts/glass-tty-vt220-001.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Hacking with Style: TrueType VT220 Font
 EAPI=6
 HOMEPAGE=http://sensi.org/~svo/glasstty/
@@ -9,5 +9,5 @@ LICENSE=freedist
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://sensi.org/~svo/glasstty/Glass_TTY_VT220.ttf -> Glass_TTY_VT220-001.3.ttf
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cfa75cedeed0340ee4983b7582ab3a98
diff --git a/metadata/md5-cache/media-fonts/hack-3.003 b/metadata/md5-cache/media-fonts/hack-3.003
index b36aa90e5b4a..899ffa109ebe 100644
--- a/metadata/md5-cache/media-fonts/hack-3.003
+++ b/metadata/md5-cache/media-fonts/hack-3.003
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A typeface designed for source code
 EAPI=6
 HOMEPAGE=https://github.com/source-foundry/Hack
@@ -9,5 +9,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d959853a8970a7d2b494da195fe25997
diff --git a/metadata/md5-cache/media-fonts/hermit-1.1 b/metadata/md5-cache/media-fonts/hermit-1.1
index 6d391fdc414f..8fb450bf7946 100644
--- a/metadata/md5-cache/media-fonts/hermit-1.1
+++ b/metadata/md5-cache/media-fonts/hermit-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A monospace font designed to be clear, pragmatic and very readable
 EAPI=5
 HOMEPAGE=https://pcaro.es/p/hermit/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://pcaro.es/d/otf-hermit-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c12497958868a1282c39eaadb2e7b351
diff --git a/metadata/md5-cache/media-fonts/hermit-1.21 b/metadata/md5-cache/media-fonts/hermit-1.21
index 5934d6620eec..95124aac76c6 100644
--- a/metadata/md5-cache/media-fonts/hermit-1.21
+++ b/metadata/md5-cache/media-fonts/hermit-1.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A monospace font designed to be clear, pragmatic and very readable
 EAPI=5
 HOMEPAGE=https://pcaro.es/p/hermit/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://pcaro.es/d/otf-hermit-1.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c12497958868a1282c39eaadb2e7b351
diff --git a/metadata/md5-cache/media-fonts/heuristica-1.0.2 b/metadata/md5-cache/media-fonts/heuristica-1.0.2
index eb23eec32ac2..412dfa2e41a6 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A font based on Adobe Utopia
 EAPI=6
 HOMEPAGE=https://heuristica.sourceforge.io/
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a8ddfafa7b16dd114984a87d7d9b1c82
diff --git a/metadata/md5-cache/media-fonts/hkscs-ming-1.0_pre20030919-r2 b/metadata/md5-cache/media-fonts/hkscs-ming-1.0_pre20030919-r2
index 5234cb69431e..6b2b2293e626 100644
--- a/metadata/md5-cache/media-fonts/hkscs-ming-1.0_pre20030919-r2
+++ b/metadata/md5-cache/media-fonts/hkscs-ming-1.0_pre20030919-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Hong Kong Official Reference Chinese Font that implements ISO10646 & HKSCS-2001
 EAPI=0
 HOMEPAGE=http://www.ogcio.gov.hk/en/business/tech_promotion/ccli/hkscs/
@@ -9,5 +9,5 @@ LICENSE=HKSCS-2001
 RESTRICT=mirror strip binchecks
 SLOT=0
 SRC_URI=http://www.ogcio.gov.hk/en/business/tech_promotion/ccli/terms/doc/mandrake_setup.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd5948ecb5b4681d63f52e3ad3d43cb2
diff --git a/metadata/md5-cache/media-fonts/hunkyfonts-0.3.1 b/metadata/md5-cache/media-fonts/hunkyfonts-0.3.1
index 8a204019f4ba..96fa3f4d871d 100644
--- a/metadata/md5-cache/media-fonts/hunkyfonts-0.3.1
+++ b/metadata/md5-cache/media-fonts/hunkyfonts-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Free TrueType fonts based on Bitstream's Vera fonts with additional letters
 EAPI=0
 HOMEPAGE=https://sourceforge.net/projects/hunkyfonts/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd
 LICENSE=BitstreamVera public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/hunkyfonts/hunkyfonts-0.3.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=41e7304e1a7cfdfff8cd29a6caf14dd3
diff --git a/metadata/md5-cache/media-fonts/ibm-plex-1.2.3 b/metadata/md5-cache/media-fonts/ibm-plex-1.2.3
index 40592bfde4d2..cacba9b46745 100644
--- a/metadata/md5-cache/media-fonts/ibm-plex-1.2.3
+++ b/metadata/md5-cache/media-fonts/ibm-plex-1.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The package of IBM's typeface
 EAPI=6
 HOMEPAGE=https://github.com/IBM/plex
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1
 REQUIRED_USE=^^ ( otf ttf )
 SLOT=0
 SRC_URI=https://github.com/IBM/plex/archive/v1.2.3.tar.gz -> ibm-plex-1.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8fb8b80c282935365217e2d94aa5aa56
diff --git a/metadata/md5-cache/media-fonts/inconsolata-20140821 b/metadata/md5-cache/media-fonts/inconsolata-20140821
index db028863a1b1..e8b8fbb7445a 100644
--- a/metadata/md5-cache/media-fonts/inconsolata-20140821
+++ b/metadata/md5-cache/media-fonts/inconsolata-20140821
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A sans-serif monotype font for code listings
 EAPI=5
 HOMEPAGE=https://fonts.google.com/specimen/Inconsolata
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/inconsolata-20140821.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d7a55f69f595dee2db1c17b6c9be05d5
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 7e08eca7393a..fda7e426a018 100644
--- a/metadata/md5-cache/media-fonts/inconsolata-hellenic-1.19-r1
+++ b/metadata/md5-cache/media-fonts/inconsolata-hellenic-1.19-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Hellenisation of the wonderful, monospace, open/free font Inconsolata
 EAPI=6
 HOMEPAGE=http://www.cosmix.org/software/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://www.cosmix.org/software/files/InconsolataHellenic.zip -> inconsolata-hellenic-1.19.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=823a40f1abb3604d16ef3edd8995fa4d
diff --git a/metadata/md5-cache/media-fonts/inconsolata-lgc-1.1.0_p20140917 b/metadata/md5-cache/media-fonts/inconsolata-lgc-1.1.0_p20140917
index f15fd6307b47..4889352b908b 100644
--- a/metadata/md5-cache/media-fonts/inconsolata-lgc-1.1.0_p20140917
+++ b/metadata/md5-cache/media-fonts/inconsolata-lgc-1.1.0_p20140917
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Modified version of Inconsolata Hellenic adding the Cyrillic alphabet
 EAPI=6
 HOMEPAGE=https://github.com/DeLaGuardo/Inconsolata-LGC
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/DeLaGuardo/Inconsolata-LGC/tarball/d086a618248121d61e3f3de64b4301230d1c860c -> inconsolata-lgc-1.1.0_p20140917.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf99e073ebdd4a1e3ceb42a231f7a01e
diff --git a/metadata/md5-cache/media-fonts/intlfonts-1.2.1 b/metadata/md5-cache/media-fonts/intlfonts-1.2.1
index ad3f9f25ab90..ada9d13f016c 100644
--- a/metadata/md5-cache/media-fonts/intlfonts-1.2.1
+++ b/metadata/md5-cache/media-fonts/intlfonts-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=x11-apps/bdftopcf x11-apps/mkfontdir X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=x11-apps/bdftopcf x11-apps/mkfontdir X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=International X11 fixed fonts
 EAPI=0
 HOMEPAGE=https://www.gnu.org/directory/intlfonts.html
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/intlfonts/intlfonts-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d91e05a2c724f433d850503f3d8c8500
diff --git a/metadata/md5-cache/media-fonts/iosevka-1.14.1 b/metadata/md5-cache/media-fonts/iosevka-1.14.1
index e7fad4431501..c72eaee49175 100644
--- a/metadata/md5-cache/media-fonts/iosevka-1.14.1
+++ b/metadata/md5-cache/media-fonts/iosevka-1.14.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Slender typeface for code, from code
 EAPI=6
 HOMEPAGE=https://be5invis.github.io/Iosevka/
@@ -8,5 +8,5 @@ KEYWORDS=~x86 ~amd64 ~arm ~arm64 ~ppc64
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=becae4c313c42583cd2e923fb0057732
diff --git a/metadata/md5-cache/media-fonts/ipaex-002.01 b/metadata/md5-cache/media-fonts/ipaex-002.01
index 2f6df46aae8a..02ad7742d096 100644
--- a/metadata/md5-cache/media-fonts/ipaex-002.01
+++ b/metadata/md5-cache/media-fonts/ipaex-002.01
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Japanese IPA extended TrueType fonts
 EAPI=5
 HOMEPAGE=http://ipafont.ipa.go.jp/
@@ -9,5 +9,5 @@ LICENSE=IPAfont
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00201.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2530b46a3470f893c597d37a58cdc7ce
diff --git a/metadata/md5-cache/media-fonts/ipamonafont-1.0.8 b/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
index 664e2c626677..c4f6eb455902 100644
--- a/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
+++ b/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Hacked version of IPA fonts, which is suitable for browsing 2ch
 EAPI=0
 HOMEPAGE=http://www.geocities.jp/ipa_mona/index.html
@@ -9,5 +9,5 @@ LICENSE=grass-ipafonts mplus-fonts public-domain
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.geocities.jp/ipa_mona/opfc-ModuleHP-1.1.1_withIPAMonaFonts-1.0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b213590c8e72e09efa5f6cf8be7e7349
diff --git a/metadata/md5-cache/media-fonts/ja-ipafonts-003.02-r1 b/metadata/md5-cache/media-fonts/ja-ipafonts-003.02-r1
index 0d0bebffc499..44cdaa0e6692 100644
--- a/metadata/md5-cache/media-fonts/ja-ipafonts-003.02-r1
+++ b/metadata/md5-cache/media-fonts/ja-ipafonts-003.02-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=TrueType fonts developed by Japanese Information-technology Promotion Agency
 EAPI=5
 HOMEPAGE=http://ipafont.ipa.go.jp/
@@ -9,5 +9,5 @@ LICENSE=IPAfont
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://dl.ipafont.ipa.go.jp/IPAfont/IPAfont00302.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7482031da8179eb2bba11fd0dcf4d28
diff --git a/metadata/md5-cache/media-fonts/ja-ipafonts-003.03 b/metadata/md5-cache/media-fonts/ja-ipafonts-003.03
index 668373a881f4..6cc539d0ddfe 100644
--- a/metadata/md5-cache/media-fonts/ja-ipafonts-003.03
+++ b/metadata/md5-cache/media-fonts/ja-ipafonts-003.03
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=TrueType fonts developed by Japanese Information-technology Promotion Agency
 EAPI=5
 HOMEPAGE=http://ipafont.ipa.go.jp/
@@ -9,5 +9,5 @@ LICENSE=IPAfont
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://dl.ipafont.ipa.go.jp/IPAfont/IPAfont00303.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=92dc1a22aa599442c456bda2d2528c10
diff --git a/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r2 b/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r2
index 9567e2ed4460..16b5d837b5ed 100644
--- a/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r2
+++ b/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
 DESCRIPTION=Japanese fixed fonts that cover JIS0213 charset
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -9,5 +9,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b9e523b8c0c7a1d6325413a81d7c545
diff --git a/metadata/md5-cache/media-fonts/jomolhari-0.003c b/metadata/md5-cache/media-fonts/jomolhari-0.003c
index f48f0a779df4..0b1b1a7c63b8 100644
--- a/metadata/md5-cache/media-fonts/jomolhari-0.003c
+++ b/metadata/md5-cache/media-fonts/jomolhari-0.003c
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Bhutanese style dbu-can font for Tibetan/Dzongkha text named after Mt Jomolhari
 EAPI=5
 HOMEPAGE=http://chris.fynn.googlepages.com/jomolhari
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL
 SLOT=0
 SRC_URI=mirror://nongnu/free-tibetan/jomolhari/jomolhari-alpha3c.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=664fcc0b0222e9ff2f5076e32579ef05
diff --git a/metadata/md5-cache/media-fonts/jsmath-1.0 b/metadata/md5-cache/media-fonts/jsmath-1.0
index 20c39a83d052..37e5c340c4cc 100644
--- a/metadata/md5-cache/media-fonts/jsmath-1.0
+++ b/metadata/md5-cache/media-fonts/jsmath-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Raster fonts for jsmath
 EAPI=0
 HOMEPAGE=http://www.math.union.edu/~dpvc/jsMath/
@@ -8,5 +8,5 @@ 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8cfb8918ee3667d2c204cff0dc07292c
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 a72d2fa40819..98c4355b8579 100644
--- a/metadata/md5-cache/media-fonts/jsmath-extra-dark-1.0
+++ b/metadata/md5-cache/media-fonts/jsmath-extra-dark-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Extra raster fonts for jsmath, dark version
 EAPI=0
 HOMEPAGE=http://www.math.union.edu/~dpvc/jsMath/download/extra-fonts/
@@ -9,5 +9,5 @@ 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=917f53cafe96cb1a4d9ce3ef8990c29a
diff --git a/metadata/md5-cache/media-fonts/jsmath-extra-light-1.0 b/metadata/md5-cache/media-fonts/jsmath-extra-light-1.0
index d054555bb0a5..85032a357bdb 100644
--- a/metadata/md5-cache/media-fonts/jsmath-extra-light-1.0
+++ b/metadata/md5-cache/media-fonts/jsmath-extra-light-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Extra raster fonts for jsmath, light version
 EAPI=0
 HOMEPAGE=http://www.math.union.edu/~dpvc/jsMath/download/extra-fonts/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=media-fonts/jsmath !media-fonts/jsmath-extra-dark
 SLOT=0
 SRC_URI=mirror://gentoo/jsmath-extra-light-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=219aa6ce6defd608df8ce98b5dc5b5ca
diff --git a/metadata/md5-cache/media-fonts/kacst-fonts-1.6.2 b/metadata/md5-cache/media-fonts/kacst-fonts-1.6.2
index 4b362965e8c8..cef0c43e7f35 100644
--- a/metadata/md5-cache/media-fonts/kacst-fonts-1.6.2
+++ b/metadata/md5-cache/media-fonts/kacst-fonts-1.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=KACST Arabic TrueType Fonts
 EAPI=0
 HOMEPAGE=http://www.arabeyes.org/project.php?proj=Khotot
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/arabeyes/kacst_fonts_1.6.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5ca32a4f249b714396df3bc920f6b5c9
diff --git a/metadata/md5-cache/media-fonts/kacst-fonts-2.0 b/metadata/md5-cache/media-fonts/kacst-fonts-2.0
index 493e13aae370..9d7d24d9b827 100644
--- a/metadata/md5-cache/media-fonts/kacst-fonts-2.0
+++ b/metadata/md5-cache/media-fonts/kacst-fonts-2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=KACST Arabic TrueType Fonts
 EAPI=0
 HOMEPAGE=http://www.arabeyes.org/project.php?proj=Khotot
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/arabeyes/kacst_fonts_2.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7ca24e39d7d9879870a77de09e49e766
diff --git a/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002 b/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002
index 94a94dc4a530..4fb8c16e1cab 100644
--- a/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002
+++ b/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Font for viewing stroke order diagrams for kanji, kana and other characters
 EAPI=6
 HOMEPAGE=https://sites.google.com/site/nihilistorguk/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v4.002.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=89e584a971e8332b485c1ac66036197a
diff --git a/metadata/md5-cache/media-fonts/khmer-5.0-r1 b/metadata/md5-cache/media-fonts/khmer-5.0-r1
index a780695f9266..1c9f277f2421 100644
--- a/metadata/md5-cache/media-fonts/khmer-5.0-r1
+++ b/metadata/md5-cache/media-fonts/khmer-5.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Fonts for the Khmer language of Cambodia
 EAPI=0
 HOMEPAGE=http://www.khmeros.info/drupal/?q=en/download/fonts
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/khmer/All_KhmerOS_5.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0153360968d478962e884184c39a2c1f
diff --git a/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3 b/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3
index 41ca0229fdc6..c09243959cf1 100644
--- a/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3
+++ b/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Kochi Japanese TrueType fonts with Wadalab Fonts
 EAPI=0
 HOMEPAGE=http://efont.sourceforge.jp/
@@ -9,5 +9,5 @@ LICENSE=free-noncomm
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/efont/5411/kochi-substitute-20030809.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d0560507caad1ac49cd295b82dcf4931
diff --git a/metadata/md5-cache/media-fonts/koruri-20161105 b/metadata/md5-cache/media-fonts/koruri-20161105
index 692e0cb48382..e433e94651ae 100644
--- a/metadata/md5-cache/media-fonts/koruri-20161105
+++ b/metadata/md5-cache/media-fonts/koruri-20161105
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Japanese TrueType font based on M+ outline fonts and Open Sans
 EAPI=5
 HOMEPAGE=http://sourceforge.jp/projects/koruri/
@@ -9,5 +9,5 @@ LICENSE=mplus-fonts Apache-2.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/koruri/66647/Koruri-20161105.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ceb6c14b9a333adb89bd41002b702296
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 f6d2dcc54c83..185f07451340 100644
--- a/metadata/md5-cache/media-fonts/lfpfonts-fix-0.83-r2
+++ b/metadata/md5-cache/media-fonts/lfpfonts-fix-0.83-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
 DESCRIPTION=Linux Font Project fixed-width fonts
 EAPI=0
 HOMEPAGE=https://sourceforge.net/projects/xfonts/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/xfonts/lfpfonts-fix-src-0.83.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b4259a818adac0e02b971562ae54ec64
diff --git a/metadata/md5-cache/media-fonts/lfpfonts-var-0.84 b/metadata/md5-cache/media-fonts/lfpfonts-var-0.84
index 52ccaaa5aeed..1d40f58697c1 100644
--- a/metadata/md5-cache/media-fonts/lfpfonts-var-0.84
+++ b/metadata/md5-cache/media-fonts/lfpfonts-var-0.84
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
 DESCRIPTION=Linux Font Project variable-width fonts
 EAPI=0
 HOMEPAGE=https://sourceforge.net/projects/xfonts/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/xfonts/lfpfonts-var-src-0.84.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4a779757281733fb4cdb9de8b68a7c8b
diff --git a/metadata/md5-cache/media-fonts/liberation-fonts-2.00.1-r3 b/metadata/md5-cache/media-fonts/liberation-fonts-2.00.1-r3
index f275315db188..bd384630c86b 100644
--- a/metadata/md5-cache/media-fonts/liberation-fonts-2.00.1-r3
+++ b/metadata/md5-cache/media-fonts/liberation-fonts-2.00.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=fontforge? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) media-gfx/fontforge dev-python/fonttools ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=fontforge? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) media-gfx/fontforge dev-python/fonttools ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat
 EAPI=6
 HOMEPAGE=https://pagure.io/liberation-fonts
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm arm64 ia64 ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=!fontforge? ( https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-2.00.1.tar.gz ) fontforge? ( https://releases.pagure.org/liberation-fonts/liberation-fonts-2.00.1.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e7a809d2437c548620b2e910dd21db5
diff --git a/metadata/md5-cache/media-fonts/libertine-5.3.0.20120702-r2 b/metadata/md5-cache/media-fonts/libertine-5.3.0.20120702-r2
index 43036e28a0c0..9823992cbdeb 100644
--- a/metadata/md5-cache/media-fonts/libertine-5.3.0.20120702-r2
+++ b/metadata/md5-cache/media-fonts/libertine-5.3.0.20120702-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Fonts from the Linux Libertine Open Fonts Project
 EAPI=5
 HOMEPAGE=http://linuxlibertine.org/
@@ -9,5 +9,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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=51aa880ce798029c1e08000da9b57e56
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 52a6653420c7..c63a55996850 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Fonts from the Linux Libertine Open Fonts Project
 EAPI=6
 HOMEPAGE=http://linuxlibertine.org/
@@ -9,5 +9,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=42bdf97eea4c9c684863f0fb1a6e635d
diff --git a/metadata/md5-cache/media-fonts/lklug-0.6-r1 b/metadata/md5-cache/media-fonts/lklug-0.6-r1
index 6c56df12f3a4..7d0a902db01f 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Sinhala font
 EAPI=6
 HOMEPAGE=http://sinhala.sourceforge.net
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6d31b686b6d20f59156ebd679652bef7
diff --git a/metadata/md5-cache/media-fonts/lohit-assamese-2.91.2 b/metadata/md5-cache/media-fonts/lohit-assamese-2.91.2
index f6f778cbbb51..347d965253a7 100644
--- a/metadata/md5-cache/media-fonts/lohit-assamese-2.91.2
+++ b/metadata/md5-cache/media-fonts/lohit-assamese-2.91.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit Assamese font
 EAPI=5
 HOMEPAGE=https://pagure.io/lohit
@@ -10,5 +10,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.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6283337e52be451e74b2aaecc6b93d7c
diff --git a/metadata/md5-cache/media-fonts/lohit-bengali-2.91.2 b/metadata/md5-cache/media-fonts/lohit-bengali-2.91.2
index 1a79283109b4..92844346bd94 100644
--- a/metadata/md5-cache/media-fonts/lohit-bengali-2.91.2
+++ b/metadata/md5-cache/media-fonts/lohit-bengali-2.91.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit Bengali font
 EAPI=5
 HOMEPAGE=https://pagure.io/lohit
@@ -10,5 +10,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.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=08281e310bb2792eecbd86e53d941222
diff --git a/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.0 b/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.0
index 0dc638a411f2..568ea78f79e6 100644
--- a/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.0
+++ b/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit Devanagari font
 EAPI=5
 HOMEPAGE=https://pagure.io/lohit
@@ -10,5 +10,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.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=346bfdebb7adab7346613bb2df115a77
diff --git a/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.1 b/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.1
index d61d80638d95..c831d8fe6aa9 100644
--- a/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.1
+++ b/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit Devanagari font
 EAPI=5
 HOMEPAGE=https://pagure.io/lohit
@@ -10,5 +10,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.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a1956f7262216e42ad2e09933f98eb3c
diff --git a/metadata/md5-cache/media-fonts/lohit-fonts-2.4.2 b/metadata/md5-cache/media-fonts/lohit-fonts-2.4.2
index 329c1d0d9f47..5589d97d6c43 100644
--- a/metadata/md5-cache/media-fonts/lohit-fonts-2.4.2
+++ b/metadata/md5-cache/media-fonts/lohit-fonts-2.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit family of Indic fonts
 EAPI=0
 HOMEPAGE=https://pagure.io/lohit
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-fonts-2.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f82be50378e503adf67a1fa50e36a26c
diff --git a/metadata/md5-cache/media-fonts/lohit-gujarati-2.92.2 b/metadata/md5-cache/media-fonts/lohit-gujarati-2.92.2
index 55a2a220c32c..d05e48c9da98 100644
--- a/metadata/md5-cache/media-fonts/lohit-gujarati-2.92.2
+++ b/metadata/md5-cache/media-fonts/lohit-gujarati-2.92.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit Gujarati font
 EAPI=5
 HOMEPAGE=https://pagure.io/lohit
@@ -10,5 +10,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.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=854529c286b92c3099c873945f00fdb8
diff --git a/metadata/md5-cache/media-fonts/lohit-gurmukhi-2.91.0 b/metadata/md5-cache/media-fonts/lohit-gurmukhi-2.91.0
index 2e613930f839..dbaaabf66781 100644
--- a/metadata/md5-cache/media-fonts/lohit-gurmukhi-2.91.0
+++ b/metadata/md5-cache/media-fonts/lohit-gurmukhi-2.91.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit Gurmukhi font
 EAPI=5
 HOMEPAGE=https://pagure.io/lohit
@@ -10,5 +10,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.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=784e53930a9f0df2a3dbabe84ef2fb51
diff --git a/metadata/md5-cache/media-fonts/lohit-kannada-2.5.3 b/metadata/md5-cache/media-fonts/lohit-kannada-2.5.3
index ae8803c9993e..566a14ad19d8 100644
--- a/metadata/md5-cache/media-fonts/lohit-kannada-2.5.3
+++ b/metadata/md5-cache/media-fonts/lohit-kannada-2.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit Kannada font
 EAPI=5
 HOMEPAGE=https://pagure.io/lohit
@@ -10,5 +10,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.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=79fc766465e9f4b7c1e578a7c06e2fad
diff --git a/metadata/md5-cache/media-fonts/lohit-malayalam-2.92.0 b/metadata/md5-cache/media-fonts/lohit-malayalam-2.92.0
index 3abb03cc6c27..855c9a36b8e7 100644
--- a/metadata/md5-cache/media-fonts/lohit-malayalam-2.92.0
+++ b/metadata/md5-cache/media-fonts/lohit-malayalam-2.92.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit Malayalam font
 EAPI=5
 HOMEPAGE=https://pagure.io/lohit
@@ -10,5 +10,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.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=090530581667b5293e4482e20dbc1e33
diff --git a/metadata/md5-cache/media-fonts/lohit-marathi-2.94.0 b/metadata/md5-cache/media-fonts/lohit-marathi-2.94.0
index b5f939f69c7f..c0d0b3c618b0 100644
--- a/metadata/md5-cache/media-fonts/lohit-marathi-2.94.0
+++ b/metadata/md5-cache/media-fonts/lohit-marathi-2.94.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit Marathi font
 EAPI=5
 HOMEPAGE=https://pagure.io/lohit
@@ -10,5 +10,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.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5d9ece096b20357acff70a09e90f3100
diff --git a/metadata/md5-cache/media-fonts/lohit-nepali-2.94.0 b/metadata/md5-cache/media-fonts/lohit-nepali-2.94.0
index 7a3f547ea025..7db8d5ad7fdb 100644
--- a/metadata/md5-cache/media-fonts/lohit-nepali-2.94.0
+++ b/metadata/md5-cache/media-fonts/lohit-nepali-2.94.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit Nepali font
 EAPI=5
 HOMEPAGE=https://pagure.io/lohit
@@ -10,5 +10,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.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f38934e9ee101eb47db052489d738897
diff --git a/metadata/md5-cache/media-fonts/lohit-odia-2.91.0 b/metadata/md5-cache/media-fonts/lohit-odia-2.91.0
index 32755104be11..e9530d54d427 100644
--- a/metadata/md5-cache/media-fonts/lohit-odia-2.91.0
+++ b/metadata/md5-cache/media-fonts/lohit-odia-2.91.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit Odia font
 EAPI=5
 HOMEPAGE=https://pagure.io/lohit
@@ -10,5 +10,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.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=487bdaddfa1291261a2de3d37e18173f
diff --git a/metadata/md5-cache/media-fonts/lohit-tamil-2.91.1 b/metadata/md5-cache/media-fonts/lohit-tamil-2.91.1
index 58386e8decba..f21eead16ab2 100644
--- a/metadata/md5-cache/media-fonts/lohit-tamil-2.91.1
+++ b/metadata/md5-cache/media-fonts/lohit-tamil-2.91.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit Tamil font
 EAPI=5
 HOMEPAGE=https://pagure.io/lohit
@@ -10,5 +10,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.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a12ed982876c156639f52d60fe28f69a
diff --git a/metadata/md5-cache/media-fonts/lohit-tamil-classical-2.5.3 b/metadata/md5-cache/media-fonts/lohit-tamil-classical-2.5.3
index eb676881f2d7..507f48d14751 100644
--- a/metadata/md5-cache/media-fonts/lohit-tamil-classical-2.5.3
+++ b/metadata/md5-cache/media-fonts/lohit-tamil-classical-2.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit Tamil Classical font
 EAPI=5
 HOMEPAGE=https://pagure.io/lohit
@@ -10,5 +10,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.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=25b1173380fe8395e1752f1da3cab110
diff --git a/metadata/md5-cache/media-fonts/lohit-telugu-2.5.3 b/metadata/md5-cache/media-fonts/lohit-telugu-2.5.3
index e39b6d91f49f..a413b0fdb77e 100644
--- a/metadata/md5-cache/media-fonts/lohit-telugu-2.5.3
+++ b/metadata/md5-cache/media-fonts/lohit-telugu-2.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Lohit Telugu font
 EAPI=5
 HOMEPAGE=https://pagure.io/lohit
@@ -10,5 +10,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.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ba729274386c3c257b0c0dd8a506068a
diff --git a/metadata/md5-cache/media-fonts/mathematica-fonts-10.0 b/metadata/md5-cache/media-fonts/mathematica-fonts-10.0
index 7944bb6e1355..74c4026096d2 100644
--- a/metadata/md5-cache/media-fonts/mathematica-fonts-10.0
+++ b/metadata/md5-cache/media-fonts/mathematica-fonts-10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Mathematica's Fonts for MathML
 EAPI=5
 HOMEPAGE=http://www.wolfram.com/mathematica
@@ -9,5 +9,5 @@ LICENSE=WRI-EULA
 RESTRICT=binchecks mirror strip
 SLOT=0
 SRC_URI=http://support.wolfram.com/kb/data/uploads/2014/08/TrueType.zip -> mathematica-fonts-10.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4d37636786e5435448294db4e81202a4
diff --git a/metadata/md5-cache/media-fonts/mgopen-1.1 b/metadata/md5-cache/media-fonts/mgopen-1.1
index 9b4468d156a8..64790d348995 100644
--- a/metadata/md5-cache/media-fonts/mgopen-1.1
+++ b/metadata/md5-cache/media-fonts/mgopen-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Magenta MgOpen typeface collection for Modern Greek
 EAPI=0
 HOMEPAGE=http://www.ellak.gr/pub/fonts/mgopen/index.en.html
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=MagentaMgOpen
 SLOT=0
 SRC_URI=mirror://gentoo/mgopen-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5cdd0badd1306868f0b2f5f3c9559077
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 1c294aae9c69..6687040b2fd9 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,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Mikachan Japanese TrueType Collection fonts
 EAPI=0
 HOMEPAGE=http://mikachan-font.com/
@@ -9,5 +9,5 @@ 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7a643b3b0cb67a9fefa114f1e48d31a7
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 3ef1a0d53ca7..a2c965616ae7 100644
--- a/metadata/md5-cache/media-fonts/mikachan-font-ttc-9.1
+++ b/metadata/md5-cache/media-fonts/mikachan-font-ttc-9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Mikachan Japanese TrueType Collection fonts
 EAPI=0
 HOMEPAGE=http://mikachan-font.com/
@@ -9,5 +9,5 @@ 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=40fd89faeb11d81e51737173aed7a5b6
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 ae88d2a48e94..03f943a8f413 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,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Mikachan Japanese TrueType fonts
 EAPI=0
 HOMEPAGE=http://mikachan-font.com/
@@ -9,5 +9,5 @@ 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8b05d02d6364e06d2d023f626e16ea5
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 4538145d8573..f78f8fc4c034 100644
--- a/metadata/md5-cache/media-fonts/mix-mplus-ipa-20130617-r1
+++ b/metadata/md5-cache/media-fonts/mix-mplus-ipa-20130617-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Mixing mplus and IPA fonts
 EAPI=6
 HOMEPAGE=http://mix-mplus-ipa.sourceforge.jp/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~x86-fbsd
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=348163a30b1815fd203f3030a8c495b8
diff --git a/metadata/md5-cache/media-fonts/monafont-2.90-r2 b/metadata/md5-cache/media-fonts/monafont-2.90-r2
index 6c56956e74df..4aac59a0249d 100644
--- a/metadata/md5-cache/media-fonts/monafont-2.90-r2
+++ b/metadata/md5-cache/media-fonts/monafont-2.90-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=x11-apps/bdftopcf x11-apps/mkfontdir dev-lang/perl >=sys-apps/sed-4 app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=x11-apps/bdftopcf x11-apps/mkfontdir dev-lang/perl >=sys-apps/sed-4 app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Japanese bitmap and TrueType fonts suitable for browsing 2ch
 EAPI=0
 HOMEPAGE=http://monafont.sourceforge.net
@@ -9,5 +9,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cbf5ae8c9da499ab2dd03edcaffc2476
diff --git a/metadata/md5-cache/media-fonts/monoid-0.60 b/metadata/md5-cache/media-fonts/monoid-0.60
index c07404f4eea6..0b582c90300f 100644
--- a/metadata/md5-cache/media-fonts/monoid-0.60
+++ b/metadata/md5-cache/media-fonts/monoid-0.60
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=media-gfx/fontforge[python] X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=media-gfx/fontforge[python] X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Open source coding font
 EAPI=5
 HOMEPAGE=https://larsenwork.com/monoid/ https://github.com/larsenwork/monoid
@@ -9,5 +9,5 @@ LICENSE=MIT OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/larsenwork/monoid/archive/0.60.tar.gz -> monoid-0.60.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fb686a39475106e7247a366685f48548
diff --git a/metadata/md5-cache/media-fonts/monoid-0.61 b/metadata/md5-cache/media-fonts/monoid-0.61
index 0dd823d75705..e671d35fdeb9 100644
--- a/metadata/md5-cache/media-fonts/monoid-0.61
+++ b/metadata/md5-cache/media-fonts/monoid-0.61
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Open source coding font
 EAPI=5
 HOMEPAGE=https://larsenwork.com/monoid/ https://github.com/larsenwork/monoid
@@ -9,5 +9,5 @@ LICENSE=MIT OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/monoid-0.61.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=da4071e115b1bd7505b68a69d276e752
diff --git a/metadata/md5-cache/media-fonts/montecarlo-0-r1 b/metadata/md5-cache/media-fonts/montecarlo-0-r1
index 9c19f69a6ee6..c8b265b53c81 100644
--- a/metadata/md5-cache/media-fonts/montecarlo-0-r1
+++ b/metadata/md5-cache/media-fonts/montecarlo-0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=monospace font, created by programmers, for programmers
 EAPI=6
 HOMEPAGE=http://www.bok.net/MonteCarlo/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.bok.net/MonteCarlo/downloads/MonteCarlo-PCF.tgz bdf? ( http://www.bok.net/MonteCarlo/downloads/MonteCarlo-BDF.tgz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c7a0370c3c597798e3efcb107e5219b5
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 19aca31f7a75..644b7542a168 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,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=x11-apps/mkfontdir x11-apps/bdftopcf X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=x11-apps/mkfontdir x11-apps/bdftopcf X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=M+ Japanese bitmap fonts
 EAPI=6
 HOMEPAGE=http://mplus-fonts.sourceforge.jp/
@@ -9,5 +9,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e71445f76ceadb43f7ca24d002d3090a
diff --git a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre062 b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre062
index 516b0d4d5ba9..9f761b59807f 100644
--- a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre062
+++ b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre062
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=ipafont? ( media-gfx/fontforge media-fonts/ja-ipafonts ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=ipafont? ( media-gfx/fontforge media-fonts/ja-ipafonts ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=M+ Japanese outline fonts
 EAPI=6
 HOMEPAGE=http://mplus-fonts.osdn.jp/ http://ossipedia.ipa.go.jp/ipafont/
@@ -9,5 +9,5 @@ LICENSE=mplus-fonts ipafont? ( IPAfont )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/mplus-fonts/62344/mplus-TESTFLIGHT-062.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9965130cb1a5aed25b87172ea5fceea4
diff --git a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre063 b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre063
index 19f505fdb68c..b3c7901189c7 100644
--- a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre063
+++ b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre063
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=ipafont? ( media-gfx/fontforge media-fonts/ja-ipafonts ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=ipafont? ( media-gfx/fontforge media-fonts/ja-ipafonts ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=M+ Japanese outline fonts
 EAPI=6
 HOMEPAGE=http://mplus-fonts.osdn.jp/ http://ossipedia.ipa.go.jp/ipafont/
@@ -9,5 +9,5 @@ LICENSE=mplus-fonts ipafont? ( IPAfont )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/mplus-fonts/62344/mplus-TESTFLIGHT-063.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=34f929f894e7e23611c28c326b5efcab
diff --git a/metadata/md5-cache/media-fonts/nanum-3.0 b/metadata/md5-cache/media-fonts/nanum-3.0
index f0850614bd60..e91a29526fe6 100644
--- a/metadata/md5-cache/media-fonts/nanum-3.0
+++ b/metadata/md5-cache/media-fonts/nanum-3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Nanum Korean fonts distributed by Naver
 EAPI=5
 HOMEPAGE=http://hangeul.naver.com/2014/nanum
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/nanum-3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4ec4fbfb7fa192fee93a1c0f86036d54
diff --git a/metadata/md5-cache/media-fonts/nanumfont-2.0-r2 b/metadata/md5-cache/media-fonts/nanumfont-2.0-r2
index e88ba0c4185e..aa36773ccb28 100644
--- a/metadata/md5-cache/media-fonts/nanumfont-2.0-r2
+++ b/metadata/md5-cache/media-fonts/nanumfont-2.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Korean monospace font distributed by NHN
 EAPI=6
 HOMEPAGE=http://dev.naver.com/projects/nanumfont
@@ -9,5 +9,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9a2663c74c6be10294558f3d8a6dd738
diff --git a/metadata/md5-cache/media-fonts/nepali-fonts-1-r1 b/metadata/md5-cache/media-fonts/nepali-fonts-1-r1
index 1f5a165c71e9..315e8498060f 100644
--- a/metadata/md5-cache/media-fonts/nepali-fonts-1-r1
+++ b/metadata/md5-cache/media-fonts/nepali-fonts-1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=a collection of fonts for Nepali users
 EAPI=0
 HOMEPAGE=http://www.mpp.org.np/ http://www.nepali.info/ http://www.nepalipost.com/ http://www.moics.gov.np/download/fonts.html
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd
 LICENSE=freedist
 SLOT=0
 SRC_URI=mirror://gentoo/nepali-fonts-1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5f58821383de4bab435c5b994e3eb24a
diff --git a/metadata/md5-cache/media-fonts/noto-20170403 b/metadata/md5-cache/media-fonts/noto-20170403
index c3d09c4a5703..33ca4092df1e 100644
--- a/metadata/md5-cache/media-fonts/noto-20170403
+++ b/metadata/md5-cache/media-fonts/noto-20170403
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Google's font family that aims to support all the world's languages
 EAPI=6
 HOMEPAGE=https://www.google.com/get/noto/
@@ -10,5 +10,5 @@ RDEPEND=cjk? ( media-fonts/noto-cjk )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/noto-20170403.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=17c3b60ad88470eae812f00c3d42839f
diff --git a/metadata/md5-cache/media-fonts/noto-20181024 b/metadata/md5-cache/media-fonts/noto-20181024
index 145a74cf7474..951232551bb7 100644
--- a/metadata/md5-cache/media-fonts/noto-20181024
+++ b/metadata/md5-cache/media-fonts/noto-20181024
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Google's font family that aims to support all the world's languages
 EAPI=6
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts
@@ -10,5 +10,5 @@ RDEPEND=cjk? ( media-fonts/noto-cjk )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlei18n/noto-fonts/archive/d7af81e614086435102cca95961b141b3530a027.tar.gz -> noto-20181024.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=159169785f4f0406217f9cb7b33d8371
diff --git a/metadata/md5-cache/media-fonts/noto-cjk-20150615 b/metadata/md5-cache/media-fonts/noto-cjk-20150615
index 882dff6dd768..78e308fa3071 100644
--- a/metadata/md5-cache/media-fonts/noto-cjk-20150615
+++ b/metadata/md5-cache/media-fonts/noto-cjk-20150615
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Google's font family that aims to support all the world's languages
 EAPI=6
 HOMEPAGE=https://www.google.com/get/noto/
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/noto-cjk-20150615.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c5f79e204f4f7992f88aa090a5bf897
diff --git a/metadata/md5-cache/media-fonts/noto-cjk-20170602 b/metadata/md5-cache/media-fonts/noto-cjk-20170602
index b5854a4b804a..ff1dc79b9737 100644
--- a/metadata/md5-cache/media-fonts/noto-cjk-20170602
+++ b/metadata/md5-cache/media-fonts/noto-cjk-20170602
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Google's CJK font family
 EAPI=6
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-cjk
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlei18n/noto-cjk/archive/32a5844539f2e348ed36b44e990f9b06d7fb89fe.tar.gz -> noto-cjk-20170602.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cd58600e6ec21a4ad32c144191200fbd
diff --git a/metadata/md5-cache/media-fonts/noto-emoji-20180823 b/metadata/md5-cache/media-fonts/noto-emoji-20180823
index 6ac3f2d1e352..fbd268f9c7e6 100644
--- a/metadata/md5-cache/media-fonts/noto-emoji-20180823
+++ b/metadata/md5-cache/media-fonts/noto-emoji-20180823
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zopfli dev-python/fonttools dev-python/nototools media-gfx/pngquant x11-libs/cairo || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zopfli dev-python/fonttools dev-python/nototools media-gfx/pngquant x11-libs/cairo || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Google Noto Emoji fonts
 EAPI=6
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-emoji
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlei18n/noto-emoji/archive/07ad7f0f4dc1bfb03221c2004c7cc60c6b79b25e.tar.gz -> noto-emoji-20180823.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=600debd769eadc1b48026b7f5ab87c80
diff --git a/metadata/md5-cache/media-fonts/nunito-1.0-r1 b/metadata/md5-cache/media-fonts/nunito-1.0-r1
index 95d623e6eb19..432387581a83 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A Sans Serif font with rounded terminals
 EAPI=6
 HOMEPAGE=https://www.google.com/webfonts/specimen/Nunito https://github.com/vernnobile/NunitoFont
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/nunito-1.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f5999cfaed84c9c9469b7024159076aa
diff --git a/metadata/md5-cache/media-fonts/nuosu-sil-2.1.1 b/metadata/md5-cache/media-fonts/nuosu-sil-2.1.1
index a7bf61e10a07..e5971f51decd 100644
--- a/metadata/md5-cache/media-fonts/nuosu-sil-2.1.1
+++ b/metadata/md5-cache/media-fonts/nuosu-sil-2.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Unicode font for the standardized Yi script
 EAPI=5
 HOMEPAGE=http://scripts.sil.org/SILYi_home
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=NuosuSIL2.1.1.zip&filename=NuosuSIL2.1.1.zip -> nuosu-sil-2.1.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=06dbaec75766e871f23cab7f24d52d80
diff --git a/metadata/md5-cache/media-fonts/ohsnap-1.8.0 b/metadata/md5-cache/media-fonts/ohsnap-1.8.0
index dced2a960ecf..b0353e85cc3b 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The ohsnap / osnap monospace font (based on Artwiz Snap)
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/osnapfont
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/osnapfont/ohsnap-1.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fe2d6f4ba37ad9127363d9445435bfe8
diff --git a/metadata/md5-cache/media-fonts/oldstandard-2.2 b/metadata/md5-cache/media-fonts/oldstandard-2.2
index ad1f4f484dec..ea9b25e010dd 100644
--- a/metadata/md5-cache/media-fonts/oldstandard-2.2
+++ b/metadata/md5-cache/media-fonts/oldstandard-2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Old Standard - font with wide range of Latin, Greek and Cyrillic characters
 EAPI=0
 HOMEPAGE=http://www.thessalonica.org.ru/en/fonts.html
@@ -8,5 +8,5 @@ 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=13d6a59789b9f795cba4b7c51cdbc8cc
diff --git a/metadata/md5-cache/media-fonts/open-sans-1 b/metadata/md5-cache/media-fonts/open-sans-1
index 47135c1d6367..0a2fcac45b17 100644
--- a/metadata/md5-cache/media-fonts/open-sans-1
+++ b/metadata/md5-cache/media-fonts/open-sans-1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Clean and modern sans-serif typeface designed for legibility across interfaces
 EAPI=5
 HOMEPAGE=http://www.opensans.com/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/open-sans-1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99c68452e250a242aeb7574f4fd65abd
diff --git a/metadata/md5-cache/media-fonts/open-sans-1-r1 b/metadata/md5-cache/media-fonts/open-sans-1-r1
index c33fc4b956f8..f4f5a1bd9242 100644
--- a/metadata/md5-cache/media-fonts/open-sans-1-r1
+++ b/metadata/md5-cache/media-fonts/open-sans-1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Clean and modern sans-serif typeface designed for legibility across interfaces
 EAPI=6
 HOMEPAGE=http://www.opensans.com/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/open-sans-1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1f68496ebae73e33d6eeac86a78fed63
diff --git a/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2 b/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2
index 2c8da4559c22..d0a3fd250756 100644
--- a/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2
+++ b/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Chinese TrueType Fonts
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd
 LICENSE=Arphic
 SLOT=0
 SRC_URI=mirror://gentoo/opendesktop-fonts-1.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6fd7326934c0a06fe8aeaa4eec7f7030
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 2c522e82c48f..fd1a2fed71a9 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Chinese TrueType Fonts
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=Arphic
 SLOT=0
 SRC_URI=mirror://gentoo/opendesktop-fonts-1.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9c19fd653f94e8e660f9317ff922eee2
diff --git a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3 b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3
index 8d41460f37a0..4bf9b353c527 100644
--- a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3
+++ b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.54.0:5 >=dev-qt/qtcore-5.11.1:5 media-gfx/fontforge sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.54.0:5 >=dev-qt/qtcore-5.11.1:5 media-gfx/fontforge sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Desktop/GUI font family for integrated use with the KDE Plasma desktop
 EAPI=6
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/oxygen-fonts
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1
 RDEPEND=
 SLOT=5
 SRC_URI=mirror://kde/unstable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	773ed921fdd08bed71cb1103c45748a0	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	kde5	fc5fd805ba2ae937026fec3dc3501c13	kde5-functions	1236edc19d52100e99be7dc2fc91db0a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	font	d4df4f26ea28a5f7037dbbd6d17cc49f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	kde5	fc5fd805ba2ae937026fec3dc3501c13	kde5-functions	1236edc19d52100e99be7dc2fc91db0a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=c893d7400b2a58e8d303cf58232f583f
diff --git a/metadata/md5-cache/media-fonts/paratype-2.5 b/metadata/md5-cache/media-fonts/paratype-2.5
index 3c78cc2fd02a..f39a1a160474 100644
--- a/metadata/md5-cache/media-fonts/paratype-2.5
+++ b/metadata/md5-cache/media-fonts/paratype-2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=ParaType font collection for languages of Russia
 EAPI=5
 HOMEPAGE=https://www.paratype.com/public/
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9f0df6e91ca1dd04e876e11aec404329
diff --git a/metadata/md5-cache/media-fonts/paratype-astra-1001 b/metadata/md5-cache/media-fonts/paratype-astra-1001
index 7d45a207487b..33ac19ad08ea 100644
--- a/metadata/md5-cache/media-fonts/paratype-astra-1001
+++ b/metadata/md5-cache/media-fonts/paratype-astra-1001
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=ParaType Astra Sans/Serif fonts metrically compatible with Times New Roman
 EAPI=6
 HOMEPAGE=https://www.paratype.ru/cinfo/news.asp?NewsId=3469
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c6d039e40053601ceeccf2cb52d51f87
diff --git a/metadata/md5-cache/media-fonts/pigiarniq-1 b/metadata/md5-cache/media-fonts/pigiarniq-1
index 07ff83e8cafa..de13473410f4 100644
--- a/metadata/md5-cache/media-fonts/pigiarniq-1
+++ b/metadata/md5-cache/media-fonts/pigiarniq-1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Nunavut's official Inuktitut font
 EAPI=0
 HOMEPAGE=http://www.gov.nu.ca/english/font/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.gov.nu.ca/documents/fonts/pigiarniq.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d8d1a98c25b85de9284854febc73270b
diff --git a/metadata/md5-cache/media-fonts/polarsys-b612-fonts-1.003 b/metadata/md5-cache/media-fonts/polarsys-b612-fonts-1.003
index af0b69754021..5cddbe7f8d26 100644
--- a/metadata/md5-cache/media-fonts/polarsys-b612-fonts-1.003
+++ b/metadata/md5-cache/media-fonts/polarsys-b612-fonts-1.003
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Font designed for aircraft cockpit displays
 EAPI=6
 HOMEPAGE=http://b612-font.com/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=EPL-1.0
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
 _md5_=77dbe947e7f928cc1f3774a96c115314
diff --git a/metadata/md5-cache/media-fonts/pothana2k-2006-r1 b/metadata/md5-cache/media-fonts/pothana2k-2006-r1
index 583d09dddd84..0102157ff218 100644
--- a/metadata/md5-cache/media-fonts/pothana2k-2006-r1
+++ b/metadata/md5-cache/media-fonts/pothana2k-2006-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Pothana 2000 and Vemana fonts for the Telugu script
 EAPI=0
 HOMEPAGE=http://www.kavya-nandanam.com/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/pothana2k-2006.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5d6a3d71497307439061fa8af002952e
diff --git a/metadata/md5-cache/media-fonts/powerline-symbols-20150224 b/metadata/md5-cache/media-fonts/powerline-symbols-20150224
index 7c58ebe5c2a6..2ad64a1f3b0e 100644
--- a/metadata/md5-cache/media-fonts/powerline-symbols-20150224
+++ b/metadata/md5-cache/media-fonts/powerline-symbols-20150224
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=OpenType Unicode font with symbols for Powerline/Airline
 EAPI=5
 HOMEPAGE=https://github.com/powerline/powerline
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=MIT-with-advertising
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/powerline-symbols-20150224.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6db824a7730f22443c7f639794c66d1d
diff --git a/metadata/md5-cache/media-fonts/powerline-symbols-20170508 b/metadata/md5-cache/media-fonts/powerline-symbols-20170508
index fad0a3ed2ba3..8090eea4f038 100644
--- a/metadata/md5-cache/media-fonts/powerline-symbols-20170508
+++ b/metadata/md5-cache/media-fonts/powerline-symbols-20170508
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=OpenType Unicode font with symbols for Powerline/Airline
 EAPI=6
 HOMEPAGE=https://github.com/powerline/powerline
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bbdce3809b5958dfb74cdb47ccecb578
diff --git a/metadata/md5-cache/media-fonts/proggy-fonts-1 b/metadata/md5-cache/media-fonts/proggy-fonts-1
index 0ce94e088be4..5eaceb187012 100644
--- a/metadata/md5-cache/media-fonts/proggy-fonts-1
+++ b/metadata/md5-cache/media-fonts/proggy-fonts-1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A set of monospaced bitmap programming fonts
 EAPI=0
 HOMEPAGE=http://upperbounds.net/ https://proggyfonts.net/
@@ -8,5 +8,5 @@ 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=efa89ddfc745ff5a6f0e02793497cb5e
diff --git a/metadata/md5-cache/media-fonts/qomolangma-2012.05 b/metadata/md5-cache/media-fonts/qomolangma-2012.05
index 1e8439592772..35ebfb6f050f 100644
--- a/metadata/md5-cache/media-fonts/qomolangma-2012.05
+++ b/metadata/md5-cache/media-fonts/qomolangma-2012.05
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=|| ( app-arch/unrar app-arch/rar ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=|| ( app-arch/unrar app-arch/rar ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Tibetan Unicode Ucan and Umed fonts
 EAPI=5
 HOMEPAGE=http://www.yalasoo.com/English/docs/yalasoo_en_font.html
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=freedist
 SLOT=0
 SRC_URI=http://www.yalasoo.com/files/CTRCfonts.rar -> qomolangma-2012.05.rar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=46233f05cb86e74086f5ad54c2603619
diff --git a/metadata/md5-cache/media-fonts/quivira-4.0 b/metadata/md5-cache/media-fonts/quivira-4.0
index dcb377dcf2ba..20895b413b10 100644
--- a/metadata/md5-cache/media-fonts/quivira-4.0
+++ b/metadata/md5-cache/media-fonts/quivira-4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Unicode font with emoticons and elder scripts like Runes, Gothic, ancient Greek
 EAPI=5
 HOMEPAGE=http://www.quivira-font.com/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=freedist
 SLOT=0
 SRC_URI=http://www.quivira-font.com/files/Quivira.otf -> quivira-4.0.otf doc? ( http://www.quivira-font.com/files/Quivira.pdf -> quivira-4.0.pdf http://www.quivira-font.com/files/QuiviraTestpage.pdf -> quivira-4.0-Testpage.pdf http://www.quivira-font.com/files/QuiviraCombining.pdf -> quivira-4.0-Combining.pdf http://www.quivira-font.com/files/QuiviraPUA.pdf -> quivira-4.0-PUA.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=98b66ff6f8223a69826dc4da7ba05d15
diff --git a/metadata/md5-cache/media-fonts/quivira-4.1 b/metadata/md5-cache/media-fonts/quivira-4.1
index b78e35b12ba3..f7196ec14912 100644
--- a/metadata/md5-cache/media-fonts/quivira-4.1
+++ b/metadata/md5-cache/media-fonts/quivira-4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Unicode font with emoticons and elder scripts like Runes, Gothic, ancient Greek
 EAPI=5
 HOMEPAGE=http://www.quivira-font.com/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=freedist
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=487fbf73a71c2b4bf68a9d0af2637d8c
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 d9749bee745f..82995a814d9f 100644
--- a/metadata/md5-cache/media-fonts/ricty-3.2.0-r2
+++ b/metadata/md5-cache/media-fonts/ricty-3.2.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=media-fonts/inconsolata >=media-fonts/mix-mplus-ipa-20111002 media-gfx/fontforge X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=media-fonts/inconsolata >=media-fonts/mix-mplus-ipa-20111002 media-gfx/fontforge X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A beautiful sans-serif monotype Japanese font designed for code listings
 EAPI=6
 HOMEPAGE=http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty.html
@@ -9,5 +9,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=14387813b7a66f5082bc4a751f25b9eb
diff --git a/metadata/md5-cache/media-fonts/roboto-2.138 b/metadata/md5-cache/media-fonts/roboto-2.138
index 7618875aef9c..dc5fab2d7d55 100644
--- a/metadata/md5-cache/media-fonts/roboto-2.138
+++ b/metadata/md5-cache/media-fonts/roboto-2.138
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Standard font for Android 4.0 (Ice Cream Sandwich) and later
 EAPI=6
 HOMEPAGE=https://github.com/google/roboto
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d54e01f90e363f6bf8beb88123e3eb7a
diff --git a/metadata/md5-cache/media-fonts/sazanami-20040629 b/metadata/md5-cache/media-fonts/sazanami-20040629
index fa1ea238a4d3..7b8e0feaf8ec 100644
--- a/metadata/md5-cache/media-fonts/sazanami-20040629
+++ b/metadata/md5-cache/media-fonts/sazanami-20040629
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Sazanami Japanese TrueType fonts
 EAPI=0
 HOMEPAGE=http://efont.sourceforge.jp/
@@ -9,5 +9,5 @@ LICENSE=mplus-fonts public-domain
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8bc3f363ad835a5f8be147ac53ed3a0e
diff --git a/metadata/md5-cache/media-fonts/sgi-fonts-1.0 b/metadata/md5-cache/media-fonts/sgi-fonts-1.0
index 7840de03d4f4..cb53ac7ca8b1 100644
--- a/metadata/md5-cache/media-fonts/sgi-fonts-1.0
+++ b/metadata/md5-cache/media-fonts/sgi-fonts-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=SGI fonts collection
 EAPI=0
 HOMEPAGE=http://oss.sgi.com/projects/sgi_propack
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ia64 ~ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=11383e13b07b01adc1e1ecf64d5d7e23
diff --git a/metadata/md5-cache/media-fonts/shinonome-0.9.11 b/metadata/md5-cache/media-fonts/shinonome-0.9.11
index acbb172c3581..81a348e4f5f9 100644
--- a/metadata/md5-cache/media-fonts/shinonome-0.9.11
+++ b/metadata/md5-cache/media-fonts/shinonome-0.9.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=x11-apps/bdftopcf X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=x11-apps/bdftopcf X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Japanese bitmap fonts for X
 EAPI=0
 HOMEPAGE=http://openlab.jp/efont/shinonome/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://openlab.jp/efont/dist/shinonome/shinonome-0.9.11.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf9623bde0cf43edea49b23ab492435d
diff --git a/metadata/md5-cache/media-fonts/signika-1.001 b/metadata/md5-cache/media-fonts/signika-1.001
index 94f369f37c52..1da282890002 100644
--- a/metadata/md5-cache/media-fonts/signika-1.001
+++ b/metadata/md5-cache/media-fonts/signika-1.001
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A sans-serif with gentle character designed for signage
 EAPI=5
 HOMEPAGE=http://ancymonic.com/projects/Signika
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=186d6893a9c57f1d9bfef28613399320
diff --git a/metadata/md5-cache/media-fonts/sil-abyssinica-1.500 b/metadata/md5-cache/media-fonts/sil-abyssinica-1.500
index 006ac6606090..c164c2ad78fc 100644
--- a/metadata/md5-cache/media-fonts/sil-abyssinica-1.500
+++ b/metadata/md5-cache/media-fonts/sil-abyssinica-1.500
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=SIL Opentype Unicode fonts for Ethiopic languages
 EAPI=6
 HOMEPAGE=https://software.sil.org/abyssinica
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~pp
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-1.500.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0302766b455c71cffbfb1446ca941c22
diff --git a/metadata/md5-cache/media-fonts/sil-arabicfonts-2.100 b/metadata/md5-cache/media-fonts/sil-arabicfonts-2.100
index 41029a0edaca..a75b5e832afd 100644
--- a/metadata/md5-cache/media-fonts/sil-arabicfonts-2.100
+++ b/metadata/md5-cache/media-fonts/sil-arabicfonts-2.100
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=SIL Opentype Unicode fonts for Arabic Languages
 EAPI=6
 HOMEPAGE=http://scripts.sil.org/ArabicFonts
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/scheherazade/Scheherazade-2.100.zip https://software.sil.org/downloads/r/lateef/LateefGR-1.200.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=28b8833463ddb55f3fdecd25bb491f0d
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 1138948b3828..9d08e7a81ebd 100644
--- a/metadata/md5-cache/media-fonts/sil-charis-5.000-r1
+++ b/metadata/md5-cache/media-fonts/sil-charis-5.000-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Serif typeface for Roman and Cyrillic languages
 EAPI=6
 HOMEPAGE=http://scripts.sil.org/CharisSILfont
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-ma
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=CharisSIL-5.000.zip&filename=CharisSIL-5.000.zip -> sil-charis-5.000.zip compact? ( http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=CharisSILCompact-5.000b.zip&filename=CharisSILCompact-5.000.zip -> CharisSILCompact-5.000.zip )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b8dcfb5ef5a326ee78b6d3d9cd472c16
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 ab9c6ac651fe..203f8dd2cc73 100644
--- a/metadata/md5-cache/media-fonts/sil-doulos-5.000-r1
+++ b/metadata/md5-cache/media-fonts/sil-doulos-5.000-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=SIL Doulos - SIL font for Roman and Cyrillic Languages
 EAPI=6
 HOMEPAGE=http://scripts.sil.org/DoulosSILfont
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=DoulosSIL-5.000.zip&filename=DoulosSIL-5.000.zip -> sil-doulos-5.000.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=158bcb22effe5f224493c47f1e981b16
diff --git a/metadata/md5-cache/media-fonts/sil-ezra-2.51 b/metadata/md5-cache/media-fonts/sil-ezra-2.51
index a1c7914b2b0e..b504c57b660a 100644
--- a/metadata/md5-cache/media-fonts/sil-ezra-2.51
+++ b/metadata/md5-cache/media-fonts/sil-ezra-2.51
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=SIL Ezra - Unicode Opentype fonts for Biblical Hebrew
 EAPI=0
 HOMEPAGE=http://scripts.sil.org/EzraSIL_Home
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ia64 ~ppc s390 sh sparc x86 ~x86-fbsd
 LICENSE=MIT OFL-1.1
 SLOT=0
 SRC_URI=mirror://gentoo/EzraSIL251.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8066d9d8f688b95ed2fa41edf992a936
diff --git a/metadata/md5-cache/media-fonts/sil-galatia-2.1 b/metadata/md5-cache/media-fonts/sil-galatia-2.1
index 4c06b8977257..dd81fab2b043 100644
--- a/metadata/md5-cache/media-fonts/sil-galatia-2.1
+++ b/metadata/md5-cache/media-fonts/sil-galatia-2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=The Galatia SIL Greek Unicode Fonts package
 EAPI=0
 HOMEPAGE=http://scripts.sil.org/SILgrkuni
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=mirror://gentoo/GalSIL21.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fcca89fb268f54222169b004fec51a8e
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 d4789b4643e6..a466f979caf0 100644
--- a/metadata/md5-cache/media-fonts/sil-gentium-5.000-r1
+++ b/metadata/md5-cache/media-fonts/sil-gentium-5.000-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Gentium Plus unicode font for Latin and Greek languages
 EAPI=6
 HOMEPAGE=http://scripts.sil.org/gentium
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-ma
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=GentiumPlus-5.000.zip&filename=GentiumPlus-5.000.zip -> sil-gentium-5.000.zip compact? ( http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=GentiumPlusCompact-5.000b.zip&filename=GentiumPlusCompact-5.000.zip -> GentiumPlusCompact-5.000.zip )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c68a98ce60d2e416d126ca88313259f
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 97763747ede3..62262eeaf5ba 100644
--- a/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1
+++ b/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=SIL fonts for Myanmar script
 EAPI=6
 HOMEPAGE=http://scripts.sil.org/padauk
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=OFL
 SLOT=0
 SRC_URI=mirror://gentoo/padauk-2.8.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=37331a669258c27e0227c785b99c3ad5
diff --git a/metadata/md5-cache/media-fonts/sophia-nubian-1.0 b/metadata/md5-cache/media-fonts/sophia-nubian-1.0
index 6338a1f0a449..39b5d951b867 100644
--- a/metadata/md5-cache/media-fonts/sophia-nubian-1.0
+++ b/metadata/md5-cache/media-fonts/sophia-nubian-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Unicode sans-serif typeface for Coptic/Nubian languages
 EAPI=5
 HOMEPAGE=http://scripts.sil.org/SophiaNubian
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=SN1.0.zip&filename=SN1.0.zip -> sophia-nubian-1.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=96a61a3d06b7faee663749de32ba0c4d
diff --git a/metadata/md5-cache/media-fonts/source-han-sans-1.001 b/metadata/md5-cache/media-fonts/source-han-sans-1.001
index 54dc2c59f674..ef1a472f244e 100644
--- a/metadata/md5-cache/media-fonts/source-han-sans-1.001
+++ b/metadata/md5-cache/media-fonts/source-han-sans-1.001
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Pan-CJK OpenType/CFF font family
 EAPI=5
 HOMEPAGE=https://github.com/adobe-fonts/source-han-sans/
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=l10n_ja? ( https://dev.gentoo.org/~jstein/dist/source-han-sans-ja-1.001.tar.xz ) l10n_ko? ( https://dev.gentoo.org/~jstein/dist/source-han-sans-ko-1.001.tar.xz ) l10n_zh-CN? ( https://dev.gentoo.org/~jstein/dist/source-han-sans-zh_CN-1.001.tar.xz ) l10n_zh-TW? ( https://dev.gentoo.org/~jstein/dist/source-han-sans-zh_TW-1.001.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=230fb0f367bd8a8512bf4d37b10c58b9
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 fe9a5b4e5235..a53e9fc4e9e2 100644
--- a/metadata/md5-cache/media-fonts/source-han-sans-1.004
+++ b/metadata/md5-cache/media-fonts/source-han-sans-1.004
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Pan-CJK OpenType/CFF font family
 EAPI=6
 HOMEPAGE=https://github.com/adobe-fonts/source-han-sans/
@@ -10,5 +10,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=00c740af0b935cd7b3e2302782b7bda0
diff --git a/metadata/md5-cache/media-fonts/source-pro-20141211 b/metadata/md5-cache/media-fonts/source-pro-20141211
index 9c831c5ad157..7f2f97633f95 100644
--- a/metadata/md5-cache/media-fonts/source-pro-20141211
+++ b/metadata/md5-cache/media-fonts/source-pro-20141211
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Adobe's open source typeface family designed for UI environments
 EAPI=5
 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/
@@ -10,5 +10,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.010R-ro/1.065R-it.tar.gz -> source-sans-pro-20141211.tar.gz https://github.com/adobe-fonts/source-serif-pro/archive/1.017R.tar.gz -> source-serif-pro-20141211.tar.gz https://github.com/adobe-fonts/source-code-pro/archive/1.017R.tar.gz -> source-code-pro-20141211.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4e8c6befaaf55902694d544ec20f46bb
diff --git a/metadata/md5-cache/media-fonts/source-pro-20160608 b/metadata/md5-cache/media-fonts/source-pro-20160608
index e5ad93cd57c7..bf835ffe5bea 100644
--- a/metadata/md5-cache/media-fonts/source-pro-20160608
+++ b/metadata/md5-cache/media-fonts/source-pro-20160608
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Adobe's open source typeface family designed for UI environments
 EAPI=6
 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/
@@ -10,5 +10,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-20160608.tar.gz https://github.com/adobe-fonts/source-serif-pro/archive/1.017R.tar.gz -> source-serif-pro-20160608.tar.gz https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.tar.gz -> source-code-pro-20160608.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d8d333e4fc2c3f6dbd4c37ffc86ee814
diff --git a/metadata/md5-cache/media-fonts/source-pro-20170111 b/metadata/md5-cache/media-fonts/source-pro-20170111
index d3ec9f99c608..dd253d187d68 100644
--- a/metadata/md5-cache/media-fonts/source-pro-20170111
+++ b/metadata/md5-cache/media-fonts/source-pro-20170111
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Adobe's open source typeface family designed for UI environments
 EAPI=6
 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/
@@ -10,5 +10,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=411185efcc8ac919d212d366ea91eaa5
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 ae6d373402e1..dea52e6b29bc 100644
--- a/metadata/md5-cache/media-fonts/stix-fonts-1.1.1
+++ b/metadata/md5-cache/media-fonts/stix-fonts-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Comprehensive OpenType font set of mathematical symbols and alphabets
 EAPI=5
 HOMEPAGE=http://www.stixfonts.org/
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=mirror://sourceforge/stixfonts/STIXv1.1.1-word.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=247974bc9756fab91f7733c4f74e0eba
diff --git a/metadata/md5-cache/media-fonts/stix-fonts-2.0.0 b/metadata/md5-cache/media-fonts/stix-fonts-2.0.0
index 38a39326ce30..abcadcd039dc 100644
--- a/metadata/md5-cache/media-fonts/stix-fonts-2.0.0
+++ b/metadata/md5-cache/media-fonts/stix-fonts-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Comprehensive OpenType font set of mathematical symbols and alphabets
 EAPI=6
 HOMEPAGE=http://www.stixfonts.org/
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=mirror://sourceforge/stixfonts/STIXv2.0.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=302ee99179286101d2231682bf69bc3d
diff --git a/metadata/md5-cache/media-fonts/symbola-11.00-r1 b/metadata/md5-cache/media-fonts/symbola-11.00-r1
index 7a63c9947b10..25dbdf6aaf19 100644
--- a/metadata/md5-cache/media-fonts/symbola-11.00-r1
+++ b/metadata/md5-cache/media-fonts/symbola-11.00-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Unicode font for Latin, IPA Extensions, Greek, Cyrillic and many Symbol Blocks
 EAPI=6
 HOMEPAGE=http://users.teilar.gr/~g1951d/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=Unicode_Fonts_for_Ancient_Scripts
 SLOT=0
 SRC_URI=http://users.teilar.gr/~g1951d/Symbola.zip -> symbola-11.00.zip doc? ( http://users.teilar.gr/~g1951d/Symbola.pdf -> symbola-11.00.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ae4fae7dd34be94c97a7a05c95176aef
diff --git a/metadata/md5-cache/media-fonts/symbola-8.00 b/metadata/md5-cache/media-fonts/symbola-8.00
index 26830a2090c9..18b60372eb2a 100644
--- a/metadata/md5-cache/media-fonts/symbola-8.00
+++ b/metadata/md5-cache/media-fonts/symbola-8.00
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Unicode font for Latin, IPA Extensions, Greek, Cyrillic and many Symbol Blocks
 EAPI=5
 HOMEPAGE=http://users.teilar.gr/~g1951d/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ppc x86
 LICENSE=Unicode_Fonts_for_Ancient_Scripts
 SLOT=0
 SRC_URI=http://users.teilar.gr/~g1951d/Symbola.zip -> symbola-8.00.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cd0eb67962b0389cd8fc6d800597bf7e
diff --git a/metadata/md5-cache/media-fonts/symbola-9.17 b/metadata/md5-cache/media-fonts/symbola-9.17
index 1a06d5f34dd7..a6b6a022be22 100644
--- a/metadata/md5-cache/media-fonts/symbola-9.17
+++ b/metadata/md5-cache/media-fonts/symbola-9.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Unicode font for Latin, IPA Extensions, Greek, Cyrillic and many Symbol Blocks
 EAPI=5
 HOMEPAGE=http://users.teilar.gr/~g1951d/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ppc x86
 LICENSE=Unicode_Fonts_for_Ancient_Scripts
 SLOT=0
 SRC_URI=http://users.teilar.gr/~g1951d/Symbola.zip -> symbola-9.17.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a207212804899af751cf56886273e62f
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 3c69c0a88c3b..3cfd8f7a4a7f 100644
--- a/metadata/md5-cache/media-fonts/takao-fonts-003.02.01
+++ b/metadata/md5-cache/media-fonts/takao-fonts-003.02.01
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A community developed derivatives of IPA Fonts
 EAPI=0
 HOMEPAGE=https://launchpad.net/takao-fonts
@@ -9,5 +9,5 @@ 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=837dc17b276f5478158fc1618d0ceabd
diff --git a/metadata/md5-cache/media-fonts/tengwar-fonts-1.9d b/metadata/md5-cache/media-fonts/tengwar-fonts-1.9d
index 00c224d52012..25ce9bb2df52 100644
--- a/metadata/md5-cache/media-fonts/tengwar-fonts-1.9d
+++ b/metadata/md5-cache/media-fonts/tengwar-fonts-1.9d
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Tengwar - the Elvish letters, created by Feanor and described by J.R.R.Tolkien)
 EAPI=0
 HOMEPAGE=http://www.tengwar.art.pl/ktt/en/download.php
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5f291dca489894de32a5798d3670cf05
diff --git a/metadata/md5-cache/media-fonts/terminus-font-4.46 b/metadata/md5-cache/media-fonts/terminus-font-4.46
index 49a108c2105b..00443197e6df 100644
--- a/metadata/md5-cache/media-fonts/terminus-font-4.46
+++ b/metadata/md5-cache/media-fonts/terminus-font-4.46
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=app-arch/gzip virtual/awk pcf? ( x11-apps/bdftopcf ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/gzip virtual/awk pcf? ( x11-apps/bdftopcf ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A clean fixed font for the console and X11
 EAPI=6
 HOMEPAGE=http://terminus-font.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1 GPL-2
 REQUIRED_USE=X? ( pcf )
 SLOT=0
 SRC_URI=mirror://sourceforge/terminus-font/terminus-font-4.46/terminus-font-4.46.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c3d54b3a5d5e878f6de2dbea4704466f
diff --git a/metadata/md5-cache/media-fonts/terminus-font-4.47 b/metadata/md5-cache/media-fonts/terminus-font-4.47
index 53d5b5f01784..1561451913f1 100644
--- a/metadata/md5-cache/media-fonts/terminus-font-4.47
+++ b/metadata/md5-cache/media-fonts/terminus-font-4.47
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=app-arch/gzip virtual/awk pcf? ( x11-apps/bdftopcf ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/gzip virtual/awk pcf? ( x11-apps/bdftopcf ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A clean fixed font for the console and X11
 EAPI=6
 HOMEPAGE=http://terminus-font.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1 GPL-2
 REQUIRED_USE=X? ( pcf )
 SLOT=0
 SRC_URI=mirror://sourceforge/terminus-font/terminus-font-4.47/terminus-font-4.47.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56aaedcd7044fe2668fb3fd80c9384a8
diff --git a/metadata/md5-cache/media-fonts/termsyn-1.8.7 b/metadata/md5-cache/media-fonts/termsyn-1.8.7
index f890b1c949dc..8b6289a59190 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Monospaced font based on terminus and tamsyn
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/termsyn/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/termsyn/files/termsyn-1.8.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f1b4faab8488b85489a766b0e53bc076
diff --git a/metadata/md5-cache/media-fonts/tex-gyre-2.005 b/metadata/md5-cache/media-fonts/tex-gyre-2.005
index 194897288039..f9e723828ea6 100644
--- a/metadata/md5-cache/media-fonts/tex-gyre-2.005
+++ b/metadata/md5-cache/media-fonts/tex-gyre-2.005
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Extensive remake of freely available URW fonts
 EAPI=5
 HOMEPAGE=http://www.gust.org.pl/projects/e-foundry/tex-gyre
@@ -8,5 +8,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/tg-2.005otf.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b52ba604cb109c5f1e8234d0fe6cbfc2
diff --git a/metadata/md5-cache/media-fonts/texcm-ttf-1.0 b/metadata/md5-cache/media-fonts/texcm-ttf-1.0
index 4b4cec2a4658..61fc886c0c68 100644
--- a/metadata/md5-cache/media-fonts/texcm-ttf-1.0
+++ b/metadata/md5-cache/media-fonts/texcm-ttf-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=TeX's Computer Modern Fonts for MathML
 EAPI=0
 HOMEPAGE=http://www.mozilla.org/projects/mathml/fonts/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~
 LICENSE=bakoma
 SLOT=0
 SRC_URI=http://www.mozilla.org/projects/mathml/fonts/bakoma/texcm-ttf.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b6ac0e775d5ae2fde43ed3e46893e7e
diff --git a/metadata/md5-cache/media-fonts/thaifonts-scalable-0.6.1 b/metadata/md5-cache/media-fonts/thaifonts-scalable-0.6.1
index 375244e480c9..f3660cebd316 100644
--- a/metadata/md5-cache/media-fonts/thaifonts-scalable-0.6.1
+++ b/metadata/md5-cache/media-fonts/thaifonts-scalable-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A collection of Free fonts for Thai
 EAPI=5
 HOMEPAGE=https://linux.thai.net/projects/thaifonts-scalable
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2-with-font-exception GPL-3-with-font-exception )
 SLOT=0
 SRC_URI=ftp://linux.thai.net/pub/thailinux/software/thai-ttf/ttf-tlwg-0.6.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9a2083b7b082839d1da26ccb3c8fc1d5
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 f237fb729a37..649d9c01ba0e 100644
--- a/metadata/md5-cache/media-fonts/tibetan-machine-font-1.901
+++ b/metadata/md5-cache/media-fonts/tibetan-machine-font-1.901
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Fonts for the Tibetan and Himalayan languages
 EAPI=0
 HOMEPAGE=http://www.thdl.org/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/TibetanMachineUnicodeFont-1.901.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9268828e8a927dc137a251499822122e
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 c4352dd85589..0259aecc248c 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,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Bitstream Vera font family
 EAPI=0
 HOMEPAGE=https://www.gnome.org/fonts/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-
 LICENSE=BitstreamVera
 SLOT=0
 SRC_URI=mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c7d1892b3cca57b0b651420e41424607
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 18652cb29b5e..a801a45e7fbb 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,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A set of matching libre/open fonts funded by Canonical
 EAPI=6
 HOMEPAGE=http://font.ubuntu.com/
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=520d57793e185cef8740e5d0839f0171
diff --git a/metadata/md5-cache/media-fonts/umeplus-fonts-20130511 b/metadata/md5-cache/media-fonts/umeplus-fonts-20130511
index 18d67a4fa0de..3ef7989a6ebc 100644
--- a/metadata/md5-cache/media-fonts/umeplus-fonts-20130511
+++ b/metadata/md5-cache/media-fonts/umeplus-fonts-20130511
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=UmePlus fonts are modified Ume and M+ fonts for Japanese
 EAPI=5
 HOMEPAGE=http://www.geocities.jp/ep3797/modified_fonts_01.html
@@ -9,5 +9,5 @@ LICENSE=mplus-fonts public-domain
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://sourceforge/mdk-ut/umeplus-fonts-20130511.tar.lzma
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=31ac1e62323a45c6ee0fc85fb3227778
diff --git a/metadata/md5-cache/media-fonts/umeplus-fonts-20131109 b/metadata/md5-cache/media-fonts/umeplus-fonts-20131109
index 5a1c4a316cbb..b10139bd8295 100644
--- a/metadata/md5-cache/media-fonts/umeplus-fonts-20131109
+++ b/metadata/md5-cache/media-fonts/umeplus-fonts-20131109
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=UmePlus fonts are modified Ume and M+ fonts for Japanese
 EAPI=5
 HOMEPAGE=http://www.geocities.jp/ep3797/modified_fonts_01.html
@@ -9,5 +9,5 @@ LICENSE=mplus-fonts public-domain
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://sourceforge/mdk-ut/umeplus-fonts-20131109.tar.lzma
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=001a375c3e53482fe5eefc876aae52dd
diff --git a/metadata/md5-cache/media-fonts/umeplus-fonts-20150115 b/metadata/md5-cache/media-fonts/umeplus-fonts-20150115
index 8539bd4fac6b..7af34635ee3b 100644
--- a/metadata/md5-cache/media-fonts/umeplus-fonts-20150115
+++ b/metadata/md5-cache/media-fonts/umeplus-fonts-20150115
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=UmePlus fonts are modified Ume and M+ fonts for Japanese
 EAPI=5
 HOMEPAGE=http://www.geocities.jp/ep3797/modified_fonts_01.html
@@ -9,5 +9,5 @@ LICENSE=mplus-fonts public-domain
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://sourceforge/mdk-ut/umeplus-fonts-20150115.tar.lzma
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4a0bc02b25cf6a28da21b450b4e512c0
diff --git a/metadata/md5-cache/media-fonts/umeplus-fonts-20160402 b/metadata/md5-cache/media-fonts/umeplus-fonts-20160402
index e7ee23e67e48..680f6706e7cd 100644
--- a/metadata/md5-cache/media-fonts/umeplus-fonts-20160402
+++ b/metadata/md5-cache/media-fonts/umeplus-fonts-20160402
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=UmePlus fonts are modified Ume and M+ fonts for Japanese
 EAPI=6
 HOMEPAGE=http://www.geocities.jp/ep3797/modified_fonts_01.html
@@ -9,5 +9,5 @@ LICENSE=mplus-fonts public-domain
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/users/10/10368/umeplus-fonts-20160402.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=194136f7fbf6b516cd2112ccfbda70fe
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 c9c8aec565df..e0ab7116871a 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,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Korean Un fonts collection
 EAPI=0
 HOMEPAGE=http://kldp.net/projects/unfonts/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://gentoo/un-fonts-core-1.0.2-080608-r1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ddf746d1a7b39367d9a6e64511f6380f
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 51b81a2f6279..d6c4b33bfef4 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,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Korean Un fonts extras collection
 EAPI=0
 HOMEPAGE=http://kldp.net/projects/unfonts/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://gentoo/un-fonts-extra-1.0.2-080608-r1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fb4760a4befbdd0ef8bc9626a61b170b
diff --git a/metadata/md5-cache/media-fonts/unifont-10.0.04 b/metadata/md5-cache/media-fonts/unifont-10.0.04
index 054c84d6d94b..f248ced8d75c 100644
--- a/metadata/md5-cache/media-fonts/unifont-10.0.04
+++ b/metadata/md5-cache/media-fonts/unifont-10.0.04
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=fontforge? ( app-text/bdf2psf dev-lang/perl dev-perl/GD[png(-)] media-gfx/fontforge x11-apps/bdftopcf ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=fontforge? ( app-text/bdf2psf dev-lang/perl dev-perl/GD[png(-)] media-gfx/fontforge x11-apps/bdftopcf ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font
 EAPI=6
 HOMEPAGE=http://unifoundry.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/unifont/unifont-10.0.04/unifont-10.0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b8c415ea35bbbbe34b66989ac73ca262
diff --git a/metadata/md5-cache/media-fonts/unifont-10.0.05 b/metadata/md5-cache/media-fonts/unifont-10.0.05
index eef4732b6dad..9bb2c01c4b04 100644
--- a/metadata/md5-cache/media-fonts/unifont-10.0.05
+++ b/metadata/md5-cache/media-fonts/unifont-10.0.05
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=fontforge? ( app-text/bdf2psf dev-lang/perl dev-perl/GD[png(-)] media-gfx/fontforge x11-apps/bdftopcf ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=fontforge? ( app-text/bdf2psf dev-lang/perl dev-perl/GD[png(-)] media-gfx/fontforge x11-apps/bdftopcf ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font
 EAPI=6
 HOMEPAGE=http://unifoundry.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/unifont/unifont-10.0.05/unifont-10.0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b8c415ea35bbbbe34b66989ac73ca262
diff --git a/metadata/md5-cache/media-fonts/unifont-10.0.06 b/metadata/md5-cache/media-fonts/unifont-10.0.06
index 8e082c96bd1e..e61153829283 100644
--- a/metadata/md5-cache/media-fonts/unifont-10.0.06
+++ b/metadata/md5-cache/media-fonts/unifont-10.0.06
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=fontforge? ( app-text/bdf2psf dev-lang/perl dev-perl/GD[png(-)] media-gfx/fontforge x11-apps/bdftopcf ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=fontforge? ( app-text/bdf2psf dev-lang/perl dev-perl/GD[png(-)] media-gfx/fontforge x11-apps/bdftopcf ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font
 EAPI=6
 HOMEPAGE=http://unifoundry.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/unifont/unifont-10.0.06/unifont-10.0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=8c5155ae32c823f511143162557e8234
diff --git a/metadata/md5-cache/media-fonts/unifont-11.0.02 b/metadata/md5-cache/media-fonts/unifont-11.0.02
index af773af2ff38..a4ea8dee0b86 100644
--- a/metadata/md5-cache/media-fonts/unifont-11.0.02
+++ b/metadata/md5-cache/media-fonts/unifont-11.0.02
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=fontforge? ( app-text/bdf2psf dev-lang/perl dev-perl/GD[png(-)] media-gfx/fontforge x11-apps/bdftopcf ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=fontforge? ( app-text/bdf2psf dev-lang/perl dev-perl/GD[png(-)] media-gfx/fontforge x11-apps/bdftopcf ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font
 EAPI=6
 HOMEPAGE=http://unifoundry.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/unifont/unifont-11.0.02/unifont-11.0.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=3ed77d66f2ef1bb3d6be3baafe125543
diff --git a/metadata/md5-cache/media-fonts/unifont-9.0.06 b/metadata/md5-cache/media-fonts/unifont-9.0.06
index 2f5ea5907cc9..1bf9c6150adf 100644
--- a/metadata/md5-cache/media-fonts/unifont-9.0.06
+++ b/metadata/md5-cache/media-fonts/unifont-9.0.06
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=fontforge? ( app-text/bdf2psf dev-lang/perl dev-perl/GD[png(-)] media-gfx/fontforge x11-apps/bdftopcf ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=fontforge? ( app-text/bdf2psf dev-lang/perl dev-perl/GD[png(-)] media-gfx/fontforge x11-apps/bdftopcf ) X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font
 EAPI=6
 HOMEPAGE=http://unifoundry.com/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/unifont/unifont-9.0.06/unifont-9.0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=ff554a7c787bb2c36640dccd69601079
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 b5aae147960a..bac170a709c5 100644
--- a/metadata/md5-cache/media-fonts/urw-fonts-2.4.9
+++ b/metadata/md5-cache/media-fonts/urw-fonts-2.4.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=free good quality fonts gpl'd by URW++
 EAPI=0
 HOMEPAGE=http://www.urwpp.de/
@@ -9,5 +9,5 @@ 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=46fc9f6170c682ce9f4c115ab08adc7e
diff --git a/metadata/md5-cache/media-fonts/urwvn-fonts-3.05 b/metadata/md5-cache/media-fonts/urwvn-fonts-3.05
index 5fb4841f7fba..e852fece0e55 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 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=fonts gpl'd by Han The Thanh, based on URW++ fonts with Vietnamese glyphs added
 EAPI=5
 HOMEPAGE=http://vntex.sf.net
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2 Aladdin
 SLOT=0
 SRC_URI=mirror://sourceforge/project/vntex/urwvn-ttf/urwvn-3.05-ttf.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c75d4353d6228701be1812790eb42166
diff --git a/metadata/md5-cache/media-fonts/vc-fonts-20020207-r2 b/metadata/md5-cache/media-fonts/vc-fonts-20020207-r2
index 3cbf3d3eaf0d..427c0fb8c372 100644
--- a/metadata/md5-cache/media-fonts/vc-fonts-20020207-r2
+++ b/metadata/md5-cache/media-fonts/vc-fonts-20020207-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
 DESCRIPTION=Vico bitmap Fonts
 EAPI=0
 HOMEPAGE=http://vico.kleinplanet.de/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://vico.kleinplanet.de/files/vc-fonts-20020207.tar.bz2 mirror://gentoo/bleed3.bdf.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	font-ebdftopcf	e23db122fd578442f37e3e79267eedd8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f56ec314ca3088d0eb2fb9d5f5fc2874
diff --git a/metadata/md5-cache/media-fonts/vdrsymbols-ttf-20100612 b/metadata/md5-cache/media-fonts/vdrsymbols-ttf-20100612
index 71291e93e132..baea95a6555d 100644
--- a/metadata/md5-cache/media-fonts/vdrsymbols-ttf-20100612
+++ b/metadata/md5-cache/media-fonts/vdrsymbols-ttf-20100612
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Font that contains symbols needed for VDR
 EAPI=0
 HOMEPAGE=http://andreas.vdr-developer.org/fonts/
@@ -8,5 +8,5 @@ KEYWORDS=~arm amd64 x86
 LICENSE=BitstreamVera
 SLOT=0
 SRC_URI=http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9ed3deaa67bc1105d62cd372d3d0590a
diff --git a/metadata/md5-cache/media-fonts/viga-1 b/metadata/md5-cache/media-fonts/viga-1
index fde412a2b213..7d5a9f506736 100644
--- a/metadata/md5-cache/media-fonts/viga-1
+++ b/metadata/md5-cache/media-fonts/viga-1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A sans-serif font with great personality and good on-screen performance
 EAPI=5
 HOMEPAGE=https://www.fontsquirrel.com/fonts/viga
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/viga-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9df11dbc7276bd1f35d02d3d9056f3d2
diff --git a/metadata/md5-cache/media-fonts/vlgothic-20110722 b/metadata/md5-cache/media-fonts/vlgothic-20110722
index 8e7fb271ab92..c51a26bb60c4 100644
--- a/metadata/md5-cache/media-fonts/vlgothic-20110722
+++ b/metadata/md5-cache/media-fonts/vlgothic-20110722
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Japanese TrueType font from Vine Linux
 EAPI=0
 HOMEPAGE=http://dicey.org/vlgothic/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=vlgothic mplus-fonts BSD-2
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/vlgothic/52711/VLGothic-20110722.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6f426a0038300356a687f9104c799e1f
diff --git a/metadata/md5-cache/media-fonts/vlgothic-20141206 b/metadata/md5-cache/media-fonts/vlgothic-20141206
index 357035589999..45a74deec9f3 100644
--- a/metadata/md5-cache/media-fonts/vlgothic-20141206
+++ b/metadata/md5-cache/media-fonts/vlgothic-20141206
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Japanese TrueType font from Vine Linux
 EAPI=0
 HOMEPAGE=http://vlgothic.dicey.org/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=vlgothic mplus-fonts BSD-2
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/vlgothic/62375/VLGothic-20141206.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=adbbe87f465fa2b3c22a75c1a157336f
diff --git a/metadata/md5-cache/media-fonts/vollkorn-2.1 b/metadata/md5-cache/media-fonts/vollkorn-2.1
index 3c34db4cd799..17000c08d371 100644
--- a/metadata/md5-cache/media-fonts/vollkorn-2.1
+++ b/metadata/md5-cache/media-fonts/vollkorn-2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Vollkorn, the free and healthy typeface for bread and butter use
 EAPI=0
 HOMEPAGE=http://friedrichalthausen.de/?page_id=411
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://friedrichalthausen.de/Vollkorn-2.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c3bf6a764fbd046084fc885187019942
diff --git a/metadata/md5-cache/media-fonts/webby-fonts-1 b/metadata/md5-cache/media-fonts/webby-fonts-1
index 20a5538d0296..243256891fa0 100644
--- a/metadata/md5-cache/media-fonts/webby-fonts-1
+++ b/metadata/md5-cache/media-fonts/webby-fonts-1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A small proportional bitmap font for use in webpages
 EAPI=0
 HOMEPAGE=http://www.proggyfonts.com/
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ia64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://dl.liveforge.org/fonts/webby-fonts-1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=69e25b245d0706afac9fc1cc28860c02
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 486c8eca1a4e..e421ae920421 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,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=WenQuanYi Bitmap Song CJK font
 EAPI=0
 HOMEPAGE=http://wenq.org/wqy2/index.cgi?Home
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/wqy/wqy-bitmapsong-pcf-1.0.0-RC1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=30e5b6903f97764759f375d8b6a7cede
diff --git a/metadata/md5-cache/media-fonts/wqy-microhei-0.2.0_beta b/metadata/md5-cache/media-fonts/wqy-microhei-0.2.0_beta
index 83d302680b39..730e1987ec37 100644
--- a/metadata/md5-cache/media-fonts/wqy-microhei-0.2.0_beta
+++ b/metadata/md5-cache/media-fonts/wqy-microhei-0.2.0_beta
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A droid derived Sans-Serif style CJK font
 EAPI=0
 HOMEPAGE=http://wqy.sourceforge.net/en/
@@ -9,5 +9,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
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=850273ad620983e4dbefa095e5e65e6c
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 3039eee5627d..a3639b66e9a1 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,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=dev-util/xdelta:3 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=dev-util/xdelta:3 X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=A droid derived Sans-Serif style CJK font
 EAPI=5
 HOMEPAGE=http://wqy.sourceforge.net/en/
@@ -9,5 +9,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=058e3f745435ea7d29bde03dd5368c04
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 ad97584a6b73..4c6568c4ae30 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,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=media-gfx/ebdftopcf sys-apps/sed X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=media-gfx/ebdftopcf sys-apps/sed X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=WenQuanYi Unibit CJK font
 EAPI=5
 HOMEPAGE=http://wenq.org/enindex.cgi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/wqy/wqy-unibit-bdf-1.1.0-1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=886f88672126f317e44fc2bb44e0ef1c
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 c4ac85df2f55..c390b77899fb 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 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font
 EAPI=5
 HOMEPAGE=http://wenq.org/wqy2/index.cgi?ZenHei
@@ -9,5 +9,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68ee7a97820282b8ee0b2777bf80fb2e
diff --git a/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r3 b/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r3
index c80a1772d7c5..3243758176b8 100644
--- a/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r3
+++ b/metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=x11-misc/imake x11-apps/mkfontdir x11-apps/bdftopcf X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=x11-misc/imake x11-apps/mkfontdir x11-apps/bdftopcf X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=This package contains character-cell fonts for use with X
 EAPI=6
 HOMEPAGE=http://www.jmknoble.net/fonts/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.pobox.com/~jmknoble/fonts/jmk-x11-fonts-3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c73d86ec39a274e5da83d9a239deb914
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 4160a582d35d..5c666b367a1e 100644
--- a/metadata/md5-cache/media-fonts/zh-kcfonts-1.05-r3
+++ b/metadata/md5-cache/media-fonts/zh-kcfonts-1.05-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=x11-apps/bdftopcf X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=x11-apps/bdftopcf X? ( || ( >=x11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )
 DESCRIPTION=Kuo Chauo Chinese Fonts collection in BIG5 encoding
 EAPI=0
 HOMEPAGE=http://freebsd.sinica.edu.tw/
@@ -9,5 +9,5 @@ LICENSE=freedist
 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 mirror://gentoo/kcfonts-1.05-freebsd-aa_ad.patch.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	d4df4f26ea28a5f7037dbbd6d17cc49f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9cf7f0fec4778f6be118d52a606d06ce
author	Repository mirror & CI <repomirrorci@gentoo.org>	2019-03-03 22:04:48 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2019-03-03 22:04:48 +0000
commit	76e4d4cdf27980df54fe7bcba038f4617663581b (patch)
tree	972ba8b990062c8dc7b36d227368e13872c084f8 /metadata/md5-cache/media-fonts
parent	Merge updates from master (diff)
download	gentoo-76e4d4cdf27980df54fe7bcba038f4617663581b.tar.gz gentoo-76e4d4cdf27980df54fe7bcba038f4617663581b.tar.bz2 gentoo-76e4d4cdf27980df54fe7bcba038f4617663581b.zip