2021-03-21 19:21:10 UTC

author: Repository mirror & CI <repomirrorci@gentoo.org> 2021-03-21 19:21:11 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2021-03-21 19:21:11 +0000
commit: 62e534b4c82a63dcf33b2f1525a75c49784b70cc (patch)
tree: 310e2505196cb066ebc2f509868765f0b82ddc89 /metadata
parent: Merge updates from master (diff)
download: gentoo-62e534b4c82a63dcf33b2f1525a75c49784b70cc.tar.gz
gentoo-62e534b4c82a63dcf33b2f1525a75c49784b70cc.tar.bz2
gentoo-62e534b4c82a63dcf33b2f1525a75c49784b70cc.zip
128 files changed, 723 insertions, 690 deletions
diff --git a/metadata/md5-cache/app-misc/mime-types-9 b/metadata/md5-cache/app-misc/mime-types-9
index 3440bdd44255..eee3db6d101a 100644
--- a/metadata/md5-cache/app-misc/mime-types-9
+++ b/metadata/md5-cache/app-misc/mime-types-9
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Provides /etc/mime.types file
-EAPI=6
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/mime-types-9.tar.bz2
-_md5_=8c88ded69ae40692184e655f25a93689
+_md5_=57ef0861e582fec42e8119e3f5cb89fc
diff --git a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814 b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
index 71e51b290403..a1cbc77bbe0c 100644
--- a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
+++ b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
@@ -1,7 +1,8 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A brainstorming and mind mapping software tool
-EAPI=6
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Brainstorming and mind mapping software tool
+EAPI=7
 HOMEPAGE=https://www.xmind.net
 INHERIT=desktop font optfeature xdg
 IUSE=X
@@ -10,5 +11,5 @@ LICENSE=EPL-1.0 LGPL-3
 RDEPEND=>=virtual/jre-1.8 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-update7-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	optfeature	6a2add34e06e5a05d88471a33ccdd73e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=e6a06affc3e2ae1cba871160a04ee545
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	font	dd073b36fe3fd8b868c23bc23209db45	optfeature	6a2add34e06e5a05d88471a33ccdd73e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=8f08617aae6e900bb72a1ecefa3f53d9
diff --git a/metadata/md5-cache/dev-libs/libyaml-0.2.5 b/metadata/md5-cache/dev-libs/libyaml-0.2.5
index 85257f16ff97..1a17d0f55ddd 100644
--- a/metadata/md5-cache/dev-libs/libyaml-0.2.5
+++ b/metadata/md5-cache/dev-libs/libyaml-0.2.5
@@ -1,6 +1,5 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=YAML 1.1 parser and emitter written in C
 EAPI=7
 HOMEPAGE=https://github.com/yaml/libyaml
@@ -12,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yaml/libyaml/archive/0.2.5.tar.gz -> libyaml-0.2.5.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
-_md5_=0c2b3967573de629523211821ff2bf7e
+_md5_=3a1c619c199871a158ea5714de6d9015
diff --git a/metadata/md5-cache/gui-libs/egl-wayland-1.1.6 b/metadata/md5-cache/gui-libs/egl-wayland-1.1.6
index d14caa1b860b..f20abe7a8d1c 100644
--- a/metadata/md5-cache/gui-libs/egl-wayland-1.1.6
+++ b/metadata/md5-cache/gui-libs/egl-wayland-1.1.6
@@ -4,11 +4,11 @@ DEPEND=dev-libs/wayland !x11-drivers/nvidia-drivers[wayland(-)] gui-libs/eglexte
 DESCRIPTION=EGLStream-based Wayland external platform (for NVIDIA)
 EAPI=7
 HOMEPAGE=https://github.com/NVIDIA/egl-wayland
-INHERIT=meson
+INHERIT=flag-o-matic meson
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland !x11-drivers/nvidia-drivers[wayland(-)]
 SLOT=0
 SRC_URI=https://github.com/NVIDIA/egl-wayland/archive/1.1.6.tar.gz -> egl-wayland-1.1.6.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	meson	e43eef9331f54965a573ed380854ff47
-_md5_=4e9a11e695fad53a90063d79967b8c0b
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	meson	e43eef9331f54965a573ed380854ff47
+_md5_=68655b1c67d6a643fe990b11b9b2a05a
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 1e14f9d2f4dc..1f6bdcf63055 100644
--- a/metadata/md5-cache/media-fonts/Humor-Sans-1.0-r1
+++ b/metadata/md5-cache/media-fonts/Humor-Sans-1.0-r1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup unpack
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A sanserif typeface in the style of xkcd
-EAPI=6
+DESCRIPTION=Sans-serif typeface in the style of xkcd
+EAPI=7
 HOMEPAGE=http://antiyawn.com/uploads/humorsans.html
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://www.antiyawn.com/uploads/Humor-Sans-1.0.ttf
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a94f8d12c3103dee49cfcfd5104db0d1
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=52fe63a2e7c1d726032bb4361e018e23
diff --git a/metadata/md5-cache/media-fonts/ahem-1.0 b/metadata/md5-cache/media-fonts/ahem-1.0
index c7b730452fe9..f5b74741814e 100644
--- a/metadata/md5-cache/media-fonts/ahem-1.0
+++ b/metadata/md5-cache/media-fonts/ahem-1.0
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A font developed to help test writers develop predictable tests
-EAPI=6
+DESCRIPTION=Font to help test writers develop predictable tests
+EAPI=7
 HOMEPAGE=https://github.com/Kozea/Ahem
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0f85e931e9329e2dd5c4af9ffcb3539d
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=c972de8dfd18fc7cbf47bcc1c3212c1b
diff --git a/metadata/md5-cache/media-fonts/alee-fonts-13-r1 b/metadata/md5-cache/media-fonts/alee-fonts-13-r1
index 9f0b77b8a454..4f28b5517fcb 100644
--- a/metadata/md5-cache/media-fonts/alee-fonts-13-r1
+++ b/metadata/md5-cache/media-fonts/alee-fonts-13-r1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A Lee's Hangul truetype fonts
-EAPI=6
+DESCRIPTION=Lee's Hangul truetype fonts
+EAPI=7
 HOMEPAGE=https://screenshots.debian.net/package/ttf-alee
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Artistic
 SLOT=0
 SRC_URI=http://turul.canonical.com/pool/main/t/ttf-alee/ttf-alee_13.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd4aff28def72ea16e06938479f350c3
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=b73902e68784dab764b05055635963bc
diff --git a/metadata/md5-cache/media-fonts/alegreya-sans-2.008 b/metadata/md5-cache/media-fonts/alegreya-sans-2.008
index 09d7d692f2d4..24fe0f64bd63 100644
--- a/metadata/md5-cache/media-fonts/alegreya-sans-2.008
+++ b/metadata/md5-cache/media-fonts/alegreya-sans-2.008
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A humanist sans-serif typeface with a calligraphic, dynamic feeling
-EAPI=6
+DESCRIPTION=Humanist sans-serif typeface with a calligraphic, dynamic feeling
+EAPI=7
 HOMEPAGE=https://www.huertatipografica.com/en/fonts/alegreya-sans-ht
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=67e6022c4bca03dae48905e5919926c8
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=3b8368db4723ff4c4f9d63672949a735
diff --git a/metadata/md5-cache/media-fonts/alegreya-serif-2.007 b/metadata/md5-cache/media-fonts/alegreya-serif-2.007
deleted file mode 100644
index fa2bd9372887..000000000000
--- a/metadata/md5-cache/media-fonts/alegreya-serif-2.007
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Alegreya serif type family
-EAPI=6
-HOMEPAGE=https://www.huertatipografica.com/en/fonts/alegreya-ht-pro
-IUSE=X
-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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9aecf7e1353599157704f8e8f7e25cc2
diff --git a/metadata/md5-cache/media-fonts/alegreya-serif-2.008 b/metadata/md5-cache/media-fonts/alegreya-serif-2.008
index a55a559e5fe7..f3f13981f29b 100644
--- a/metadata/md5-cache/media-fonts/alegreya-serif-2.008
+++ b/metadata/md5-cache/media-fonts/alegreya-serif-2.008
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Alegreya serif type family
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.huertatipografica.com/en/fonts/alegreya-ht-pro
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/huertatipografica/Alegreya/archive/v2.008.tar.gz -> alegreya-serif-2.008.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7da328283bcf915935b1e36ea0541923
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=dc71c39ad7ea721958756d560e753d23
diff --git a/metadata/md5-cache/media-fonts/andika-5.000 b/metadata/md5-cache/media-fonts/andika-5.000
index bc3705b83d16..75c0e16751eb 100644
--- a/metadata/md5-cache/media-fonts/andika-5.000
+++ b/metadata/md5-cache/media-fonts/andika-5.000
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Sans-serif font designed for literacy use
-EAPI=5
-HOMEPAGE=http://scripts.sil.org/Andika
+EAPI=7
+HOMEPAGE=https://software.sil.org/andika/
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9897383759c9510ed917b593a6df669c
+SRC_URI=https://software.sil.org/downloads/r/andika/Andika-5.000.zip -> andika-5.000.zip
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=69869f315deb7969185db469c437a2b5
diff --git a/metadata/md5-cache/media-fonts/anonymous-pro-1.002-r1 b/metadata/md5-cache/media-fonts/anonymous-pro-1.002-r1
index ba1aebbf3e1f..95c5ab70a976 100644
--- a/metadata/md5-cache/media-fonts/anonymous-pro-1.002-r1
+++ b/metadata/md5-cache/media-fonts/anonymous-pro-1.002-r1
@@ -1,13 +1,15 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Monospaced truetype font designed with coding in mind
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.marksimonson.com/fonts/view/anonymous-pro
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 arm ~arm64 x86 ~x64-macos
 LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.marksimonson.com/assets/content/fonts/AnonymousPro-1.002.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5f641fc361543cc9e282fdf5e4d9572e
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=f3a24b6c2d1b2eacad09c1bfa8fa9228
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 f831ceacff2f..5f5d15e6a674 100644
--- a/metadata/md5-cache/media-fonts/arabeyes-fonts-2.0-r1
+++ b/metadata/md5-cache/media-fonts/arabeyes-fonts-2.0-r1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Arabeyes Arabic TrueType fonts
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.arabeyes.org/Khotot#2.0
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 arm ~ia64 ppc s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/arabeyes/ae_fonts_2.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=09ad73f670a722af46146e58d965ba29
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=7321c1a27a675b36e180c92f4ece9ea7
diff --git a/metadata/md5-cache/media-fonts/arkpandora-2.04 b/metadata/md5-cache/media-fonts/arkpandora-2.04
index e971885973b0..824593213f44 100644
--- a/metadata/md5-cache/media-fonts/arkpandora-2.04
+++ b/metadata/md5-cache/media-fonts/arkpandora-2.04
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Arkpandora MS-TTF replacement font pack
-EAPI=5
+DESCRIPTION=Replacement fonts for Microsoft's Arial, Times, and Verdana fonts
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 s390 sparc x86
 LICENSE=BitstreamVera
 SLOT=0
 SRC_URI=mirror://gentoo/ttf-arkpandora-2.04.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b458b040a6f566d07ba2e11ff103888a
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=5fa3b2c445396e2da5502d978cc5943d
diff --git a/metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1-r2 b/metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1-r2
index c7e9c9bf3d22..64847008d382 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,13 +1,15 @@
+BDEPEND=media-gfx/fontforge
 DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=media-gfx/fontforge X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Chinese TrueType Arphic Fonts
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.arphic.com.tw/ https://www.freedesktop.org/wiki/Software/CJKUnifonts
+INHERIT=font xdg-utils
 IUSE=X
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e701adceade066d3e56bfe15cd6ddd22
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3b69ca02afcb73a4e708260438a42baa
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 fd8ee55d9867..d2cca0376cc7 100644
--- a/metadata/md5-cache/media-fonts/baekmuk-fonts-2.2-r2
+++ b/metadata/md5-cache/media-fonts/baekmuk-fonts-2.2-r2
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm setup unpack
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
 DESCRIPTION=Korean Baekmuk Font
-EAPI=6
-HOMEPAGE=http://kldp.net/baekmuk/
+EAPI=7
+HOMEPAGE=https://kldp.net/baekmuk/
+INHERIT=font font-ebdftopcf
 IUSE=unicode X X
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7e86b521703fcf3f669a569331503860
+SRC_URI=https://kldp.net/baekmuk/release/865-baekmuk-bdf-2.2.tar.gz -> baekmuk-bdf-2.2.tar.gz https://kldp.net/baekmuk/release/865-baekmuk-ttf-2.2.tar.gz -> baekmuk-ttf-2.2.tar.gz unicode? ( mirror://gentoo/baekmuk-unicode-bdf-20020418.tar.bz2 )
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
+_md5_=382ab5c25f3c61821016fbf2ddcc3db0
diff --git a/metadata/md5-cache/media-fonts/bitstream-cyberbit-2.0-r2 b/metadata/md5-cache/media-fonts/bitstream-cyberbit-2.0-r2
index b86b4bbf53ac..9cff7b764830 100644
--- a/metadata/md5-cache/media-fonts/bitstream-cyberbit-2.0-r2
+++ b/metadata/md5-cache/media-fonts/bitstream-cyberbit-2.0-r2
@@ -1,13 +1,15 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Cyberbit Unicode (including CJK) font
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.bitstream.com/
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b78033ca9707073b142d8bdff457a7be
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=eac3cd6e1634127fa7f86e156ca52396
diff --git a/metadata/md5-cache/media-fonts/cantarell-0.111 b/metadata/md5-cache/media-fonts/cantarell-0.111
deleted file mode 100644
index 22c778e959b6..000000000000
--- a/metadata/md5-cache/media-fonts/cantarell-0.111
+++ /dev/null
@@ -1,14 +0,0 @@
-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/mkfontscale-1.2.0 media-fonts/encodings ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DESCRIPTION=Default fontset for GNOME Shell
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/CantarellFonts
-IUSE=X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=OFL-1.1
-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	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	gnome.org	532d56d07b9eace4831aaa817d2b756a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=55f3eb9c82fa5ce5967bdd93ed077378
diff --git a/metadata/md5-cache/media-fonts/clearsans-1.00 b/metadata/md5-cache/media-fonts/clearsans-1.00
index 81754c79983e..29d30236233c 100644
--- a/metadata/md5-cache/media-fonts/clearsans-1.00
+++ b/metadata/md5-cache/media-fonts/clearsans-1.00
@@ -1,13 +1,15 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=OpenType font optimized for readability on small screens
-EAPI=6
+EAPI=7
 HOMEPAGE=https://01.org/clear-sans
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 x86
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2ea24783a60befa9c6b80eda4906979e
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=6099aacc1185f28e2af1ea3a2330b314
diff --git a/metadata/md5-cache/media-fonts/cm-unicode-0.7.0-r1 b/metadata/md5-cache/media-fonts/cm-unicode-0.7.0-r1
index db8a005b1832..cad8ed73e7e4 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,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Computer Modern Unicode fonts
-EAPI=6
-HOMEPAGE=http://cm-unicode.sourceforge.net/
+EAPI=7
+HOMEPAGE=https://cm-unicode.sourceforge.io/
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=916629bd6bee783e8c3cc0a5a87b17a6
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=72c1a68080a33928b389aae109d9d00f
diff --git a/metadata/md5-cache/media-fonts/comic-neue-2.2 b/metadata/md5-cache/media-fonts/comic-neue-2.2
deleted file mode 100644
index a65d277e0c02..000000000000
--- a/metadata/md5-cache/media-fonts/comic-neue-2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Typographically savvy casual script typeface
-EAPI=5
-HOMEPAGE=http://comicneue.com/
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=http://comicneue.com/comic-neue-2.2.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a20cba208c72c1e2908ebaf984947a92
diff --git a/metadata/md5-cache/media-fonts/comic-neue-2.3 b/metadata/md5-cache/media-fonts/comic-neue-2.3
index f05b7bfd0d57..da8aa4e4c863 100644
--- a/metadata/md5-cache/media-fonts/comic-neue-2.3
+++ b/metadata/md5-cache/media-fonts/comic-neue-2.3
@@ -1,13 +1,14 @@
-DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Typographically savvy casual script typeface
-EAPI=6
+EAPI=7
 HOMEPAGE=http://comicneue.com
 INHERIT=font
 IUSE=X
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://comicneue.com/comic-neue-2.3.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=93671429966c653688e96c587975ab38
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=b31e538ef3f284d7ccc0ab9c9f27bb4b
diff --git a/metadata/md5-cache/media-fonts/corefonts-1-r7 b/metadata/md5-cache/media-fonts/corefonts-1-r7
index 8128ceb60001..b189ed17534b 100644
--- a/metadata/md5-cache/media-fonts/corefonts-1-r7
+++ b/metadata/md5-cache/media-fonts/corefonts-1-r7
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/cabextract
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=app-arch/cabextract X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Microsoft's TrueType core fonts
-EAPI=5
+EAPI=7
 HOMEPAGE=http://corefonts.sourceforge.net/
+INHERIT=font
 IUSE=X tahoma X
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=38a17ebf9f68ea77e71ef3bbce947323
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=c20063992d9257e563d23168811f8448
diff --git a/metadata/md5-cache/media-fonts/courier-prime-1.203 b/metadata/md5-cache/media-fonts/courier-prime-1.203
index 3fa2e62144c3..fd690c5ef3f6 100644
--- a/metadata/md5-cache/media-fonts/courier-prime-1.203
+++ b/metadata/md5-cache/media-fonts/courier-prime-1.203
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A redesign of Courier
-EAPI=5
+DESCRIPTION=Redesign of Courier
+EAPI=7
 HOMEPAGE=https://www.quoteunquoteapps.com/courierprime/
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8ed168a1d027744e9e5f5dec6f2ed640
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=d98ed2ea6b91c3c4385d9481ffdff1f4
diff --git a/metadata/md5-cache/media-fonts/croscorefonts-1.31.0 b/metadata/md5-cache/media-fonts/croscorefonts-1.31.0
index ac1254ccf4c1..6feea4752804 100644
--- a/metadata/md5-cache/media-fonts/croscorefonts-1.31.0
+++ b/metadata/md5-cache/media-fonts/croscorefonts-1.31.0
@@ -1,13 +1,14 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Open licensed fonts metrically compatible with MS corefonts
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.google.com/webfonts/specimen/Arimo https://www.google.com/webfonts/specimen/Cousine https://www.google.com/webfonts/specimen/Tinos
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 arm arm64 x86
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=723cec7c26d6677be871bf7078852638
+SRC_URI=https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/croscorefonts-1.31.0.tar.bz2
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=7951dd7c358c157c9495d387710d8042
diff --git a/metadata/md5-cache/media-fonts/crosextrafonts-caladea-20130214 b/metadata/md5-cache/media-fonts/crosextrafonts-caladea-20130214
index 4e4460fb6356..66cebd235672 100644
--- a/metadata/md5-cache/media-fonts/crosextrafonts-caladea-20130214
+++ b/metadata/md5-cache/media-fonts/crosextrafonts-caladea-20130214
@@ -1,13 +1,14 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Open licensed serif font metrically compatible with Cambria
-EAPI=6
+EAPI=7
 HOMEPAGE=https://bugs.chromium.org/p/chromium/issues/detail?id=168879
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~x86
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3edd3ae652131b7db38307267f40b36f
+SRC_URI=https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-20130214.tar.gz
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=bf2dec3aec1586c33a8e0e7b144f64d7
diff --git a/metadata/md5-cache/media-fonts/crosextrafonts-carlito-20130920 b/metadata/md5-cache/media-fonts/crosextrafonts-carlito-20130920
index ae262d7ed0d3..4a34892ba621 100644
--- a/metadata/md5-cache/media-fonts/crosextrafonts-carlito-20130920
+++ b/metadata/md5-cache/media-fonts/crosextrafonts-carlito-20130920
@@ -1,13 +1,14 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Open licensed sans-serif font metrically compatible with Calibri
-EAPI=6
-HOMEPAGE=http://code.google.com/p/chromium/issues/detail?id=280557
+EAPI=7
+HOMEPAGE=https://bugs.chromium.org/p/chromium/issues/detail?id=280557
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~x86
 LICENSE=OFL
 RESTRICT=binchecks strip test
 SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-20130920.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=469d7579305e0ae49bccf738e4a68a5c
+SRC_URI=https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-20130920.tar.gz
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=08ed4d62b55a74d7ed47585826c70a16
diff --git a/metadata/md5-cache/media-fonts/culmus-0.133 b/metadata/md5-cache/media-fonts/culmus-0.133-r1
index 7f9647ed6123..bce1cae487ed 100644
--- a/metadata/md5-cache/media-fonts/culmus-0.133
+++ b/metadata/md5-cache/media-fonts/culmus-0.133-r1
@@ -1,13 +1,15 @@
+BDEPEND=app-arch/unzip >=x11-apps/mkfontscale-1.0.9-r1 fontforge? ( media-gfx/fontforge )
 DEFINED_PHASES=compile install postinst postrm prepare setup unpack
-DEPEND=!media-fonts/culmus-ancient app-arch/unzip >=x11-apps/mkfontscale-1.0.9-r1 fontforge? ( media-gfx/fontforge ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Hebrew Type1 fonts
-EAPI=6
+EAPI=7
 HOMEPAGE=http://culmus.sourceforge.net/
+INHERIT=font
 IUSE=ancient fancy fontforge taamey X
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )
 RDEPEND=!media-fonts/culmus-ancient
 SLOT=0
 SRC_URI=mirror://sourceforge/culmus/culmus-0.133.tar.gz mirror://sourceforge/culmus/culmus-type1-0.105.tar.gz fontforge? ( mirror://sourceforge/culmus/culmus-src-0.133.tar.gz ) ancient? ( !fontforge? ( mirror://sourceforge/culmus/AncientSemiticFonts-0.06-1.TTF.tgz ) fontforge? ( mirror://sourceforge/culmus/AncientSemiticFonts-0.06-1.tgz ) ) fancy? ( http://culmus.sourceforge.net/fancy/journal.tar.gz http://culmus.sourceforge.net/fancy/hillel.tar.gz http://culmus.sourceforge.net/fancy/anka.tar.gz http://culmus.sourceforge.net/fancy/comix.tar.gz http://culmus.sourceforge.net/fancy/gan.tar.gz http://culmus.sourceforge.net/fancy/ozrad.tar.gz http://culmus.sourceforge.net/fancy/ktav-yad.tar.gz http://culmus.sourceforge.net/fancy/dorian.tar.gz http://culmus.sourceforge.net/fancy/gladia.tar.gz http://culmus.sourceforge.net/fancy/horev.tar.gz ) fancy? ( http://culmus.sourceforge.net/fancy-yg/ShmuelCLM.zip http://culmus.sourceforge.net/fancy-yg/MakabiYG.zip ) taamey? ( http://culmus.sourceforge.net/taamim/TaameyDavidCLM.zip http://culmus.sourceforge.net/taamim/TaameyFrankCLM.zip http://culmus.sourceforge.net/taamim/KeterAramTsova.zip http://culmus.sourceforge.net/taamim/KeterYG.zip )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a6e146f89c2c3d9e3b547d9cf999345c
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=53e9a6e2aa55febf83963168b1d2ef73
diff --git a/metadata/md5-cache/media-fonts/dejavu-2.37 b/metadata/md5-cache/media-fonts/dejavu-2.37
index a6ee6eb6da4b..f09059c85255 100644
--- a/metadata/md5-cache/media-fonts/dejavu-2.37
+++ b/metadata/md5-cache/media-fonts/dejavu-2.37
@@ -1,12 +1,14 @@
+BDEPEND=fontforge? ( app-i18n/unicode-data dev-perl/Font-TTF >=media-gfx/fontforge-20080429 >media-libs/fontconfig-2.6.0:1.0 >=x11-apps/mkfontscale-1.2.0 )
 DEFINED_PHASES=compile install postinst postrm prepare setup unpack
-DEPEND=fontforge? ( >=x11-apps/mkfontscale-1.2.0 >=media-gfx/fontforge-20080429 dev-perl/Font-TTF app-i18n/unicode-data >media-libs/fontconfig-2.6.0:1.0 ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=DejaVu fonts, bitstream vera with ISO-8859-2 characters
-EAPI=6
+EAPI=7
 HOMEPAGE=https://dejavu-fonts.github.io/
+INHERIT=font xdg-utils
 IUSE=fontforge X
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba8f2eaa0e4da8ca9772f46bfc15b548
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2d3185e709c27a6f1c850bd24bd2a46
diff --git a/metadata/md5-cache/media-fonts/dina-2.93 b/metadata/md5-cache/media-fonts/dina-2.93
index e2bb5c3615e5..16e748c92564 100644
--- a/metadata/md5-cache/media-fonts/dina-2.93
+++ b/metadata/md5-cache/media-fonts/dina-2.93
@@ -1,13 +1,15 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 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
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
+DESCRIPTION=Monospace bitmap font, primarily aimed at programmers
+EAPI=7
+HOMEPAGE=https://www.dcmembers.com/jibsen/download/61/
+INHERIT=font font-ebdftopcf
 IUSE=X X
 KEYWORDS=amd64 x86
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=892ff2086c2d6716cbc4e4102bb3af1d
+SRC_URI=https://www.donationcoder.com/forum/index.php?action=dlattach;topic=36049.0;attach=78562 -> dina-2.93.zip
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
+_md5_=f1b82f1f6dec684927cc234803736c2a
diff --git a/metadata/md5-cache/media-fonts/droid-113-r5 b/metadata/md5-cache/media-fonts/droid-113-r5
index 91cb1f3e9fa4..c7651c790459 100644
--- a/metadata/md5-cache/media-fonts/droid-113-r5
+++ b/metadata/md5-cache/media-fonts/droid-113-r5
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm prepare setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Font family from Google's Android project
-EAPI=6
-HOMEPAGE=https://code.google.com/android/RELEASENOTES.html http://www.cosmix.org/software/
+EAPI=7
+HOMEPAGE=https://www.cosmix.org/software/#Drois%20Sans%20Mono%20%28Slashed%20Zero%29
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=87cc59fe9e588e1777d1087267797f9b
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=40f4f6ad7942b6fa925b03f722bf4e25
diff --git a/metadata/md5-cache/media-fonts/dzongkha-fonts-2009.09-r1 b/metadata/md5-cache/media-fonts/dzongkha-fonts-2009.09-r1
index 32f45110016a..51b2a59f2560 100644
--- a/metadata/md5-cache/media-fonts/dzongkha-fonts-2009.09-r1
+++ b/metadata/md5-cache/media-fonts/dzongkha-fonts-2009.09-r1
@@ -1,13 +1,15 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Bhutanese/Tibetan fonts for dzongkha script provided by the Bhutanese government
-EAPI=5
-HOMEPAGE=http://www.dit.gov.bt/downloads
+EAPI=7
+HOMEPAGE=https://www.dit.gov.bt/downloads
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=all-rights-reserved
 RESTRICT=mirror bindist
 SLOT=0
-SRC_URI=http://www.dit.gov.bt/sites/default/files/dzongkhafonts.zip -> dzongkha-fonts-2009.09.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=69a48207f0b55bfdd43e775bff4bafff
+SRC_URI=https://www.dit.gov.bt/sites/default/files/dzongkhafonts.zip -> dzongkha-fonts-2009.09.zip
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=b21cb88ad4a21dc25aa5ae8711c4768e
diff --git a/metadata/md5-cache/media-fonts/eb-garamond-0.016 b/metadata/md5-cache/media-fonts/eb-garamond-0.016
index a6e3ca5f2327..237ce8ce41e7 100644
--- a/metadata/md5-cache/media-fonts/eb-garamond-0.016
+++ b/metadata/md5-cache/media-fonts/eb-garamond-0.016
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Claude Garamont's humanist typeface from the mid-16th century
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.georgduffner.at/ebgaramond/
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4b47fcc8e2b7d44dd83de3630936ad89
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=582daf244bc43b3032b28644e8a55bee
diff --git a/metadata/md5-cache/media-fonts/essays1743-2.100 b/metadata/md5-cache/media-fonts/essays1743-2.100
index fbaf90aab1b4..443a54124cd7 100644
--- a/metadata/md5-cache/media-fonts/essays1743-2.100
+++ b/metadata/md5-cache/media-fonts/essays1743-2.100
@@ -1,12 +1,14 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=John Stracke's Essays 1743 font
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.thibault.org/fonts/essays/
-IUSE=X
+INHERIT=font
+IUSE=+otf ttf X
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=|| ( LGPL-2.1 OFL-1.1 )
+REQUIRED_USE=|| ( otf ttf )
 SLOT=0
-SRC_URI=https://www.thibault.org/fonts/essays/essays1743-2.100-1-ttf.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=635adae6234b55fda03ad09114e48839
+SRC_URI=otf? ( https://www.thibault.org/fonts/essays/essays1743-2.100-1-otf.tar.gz ) ttf? ( https://www.thibault.org/fonts/essays/essays1743-2.100-1-ttf.tar.gz )
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=01e99dee4f04f1fe7efb34037e9b573e
diff --git a/metadata/md5-cache/media-fonts/exo-2 b/metadata/md5-cache/media-fonts/exo-2
index 0b88bbfbebe1..0bc24ac8dd7b 100644
--- a/metadata/md5-cache/media-fonts/exo-2
+++ b/metadata/md5-cache/media-fonts/exo-2
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A geometric sans-serif font with a technological feel
-EAPI=5
-HOMEPAGE=http://ndiscovered.com/exo-2/
+DESCRIPTION=Geometric sans-serif font with a technological feel
+EAPI=7
+HOMEPAGE=https://www.ndiscover.com/exo-2-0/
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4cdd8f9bab7eff08f9946348544455da
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=931c4c82a50c6b4fb270d6c79cbbcdc9
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 8342909a0446..33288ac3643f 100644
--- a/metadata/md5-cache/media-fonts/fifth-leg-0.6-r1
+++ b/metadata/md5-cache/media-fonts/fifth-leg-0.6-r1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Simplistic, technical sans serif - openSUSE font
-EAPI=6
-HOMEPAGE=http://jimmac.musichall.cz/log/?p=439
+EAPI=7
+HOMEPAGE=https://jimmac.eu/
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4c9110003590305a75e009a9075d86dd
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=e6cad9448d968834eb0005719909665a
diff --git a/metadata/md5-cache/media-fonts/fira-sans-4.002 b/metadata/md5-cache/media-fonts/fira-sans-4.002
deleted file mode 100644
index 3f5347468302..000000000000
--- a/metadata/md5-cache/media-fonts/fira-sans-4.002
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Default typeface for FirefoxOS, designed for legibility
-EAPI=5
-HOMEPAGE=http://www.carrois.com/fira-4-0/
-IUSE=X
-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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=98fe264138df3903558891613c8e3e18
diff --git a/metadata/md5-cache/media-fonts/fira-sans-4.105 b/metadata/md5-cache/media-fonts/fira-sans-4.105
deleted file mode 100644
index 9eb502bcaad1..000000000000
--- a/metadata/md5-cache/media-fonts/fira-sans-4.105
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Default typeface for FirefoxOS, designed for legibility
-EAPI=5
-HOMEPAGE=http://www.carrois.com/fira-4-0/
-IUSE=X
-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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb0a0cc744109573f44498ce515742d1
diff --git a/metadata/md5-cache/media-fonts/fira-sans-4.202 b/metadata/md5-cache/media-fonts/fira-sans-4.202
index b426a8d5c370..35a0e4d6d546 100644
--- a/metadata/md5-cache/media-fonts/fira-sans-4.202
+++ b/metadata/md5-cache/media-fonts/fira-sans-4.202
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://mozilla.github.io/Fira
 INHERIT=font
 IUSE=+otf ttf X
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=OFL-1.1
 REQUIRED_USE=|| ( otf ttf )
 SLOT=0
 SRC_URI=https://github.com/mozilla/Fira/archive/4.202.tar.gz -> Fira-4.202.tar.gz
 _eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=152c4bd1f4bd0cf29facb4d155b09bdb
+_md5_=907dd66d101bfee87e7fe1e75a5760e8
diff --git a/metadata/md5-cache/media-fonts/freefont-20120503 b/metadata/md5-cache/media-fonts/freefont-20120503
index 58696973e083..ad2a586575dd 100644
--- a/metadata/md5-cache/media-fonts/freefont-20120503
+++ b/metadata/md5-cache/media-fonts/freefont-20120503
@@ -1,13 +1,15 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=OpenType and TrueType Unicode fonts from the Free UCS Outline Fonts Project
-EAPI=5
+EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/freefont/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=144b3b67c79775e45ac054442736caa3
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=df82753e9e81f06c03bbec302bdafd9a
diff --git a/metadata/md5-cache/media-fonts/gidole-2.0.2 b/metadata/md5-cache/media-fonts/gidole-2.0.2
index 7b7d915abfca..74173401d338 100644
--- a/metadata/md5-cache/media-fonts/gidole-2.0.2
+++ b/metadata/md5-cache/media-fonts/gidole-2.0.2
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Open source modern DIN fonts
-EAPI=5
+EAPI=7
 HOMEPAGE=http://gidole.github.io/
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=98edc4dd913b4477b56becfc9374c466
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=f06f910ff7f66f5abe71b91ace0d3b5c
diff --git a/metadata/md5-cache/media-fonts/hack-3.003 b/metadata/md5-cache/media-fonts/hack-3.003
index 6837a76288a5..598e15346bf3 100644
--- a/metadata/md5-cache/media-fonts/hack-3.003
+++ b/metadata/md5-cache/media-fonts/hack-3.003
@@ -1,13 +1,14 @@
-DEFINED_PHASES=install postinst postrm setup unpack
+DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A typeface designed for source code
-EAPI=6
+DESCRIPTION=Typeface designed for source code
+EAPI=7
 HOMEPAGE=https://github.com/source-foundry/Hack
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 arm arm64 ~ppc64 x86
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fc1ad3bda5f689936d67acc9df73ac2b
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=3c4c48ea08d949fcc612639f1aae2d65
diff --git a/metadata/md5-cache/media-fonts/heuristica-1.0.2 b/metadata/md5-cache/media-fonts/heuristica-1.0.2
index c640200b7135..82c725734c73 100644
--- a/metadata/md5-cache/media-fonts/heuristica-1.0.2
+++ b/metadata/md5-cache/media-fonts/heuristica-1.0.2
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A font based on Adobe Utopia
-EAPI=6
-HOMEPAGE=https://heuristica.sourceforge.io/
+DESCRIPTION=Font based on Adobe Utopia
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/heuristica/
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a8ddfafa7b16dd114984a87d7d9b1c82
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=66bba944740857c0c29c764131e2db2a
diff --git a/metadata/md5-cache/media-fonts/ibm-plex-2.0.0 b/metadata/md5-cache/media-fonts/ibm-plex-2.0.0
deleted file mode 100644
index 87533c0873b8..000000000000
--- a/metadata/md5-cache/media-fonts/ibm-plex-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=The package of IBM's typeface
-EAPI=6
-HOMEPAGE=https://github.com/IBM/plex
-IUSE=otf +ttf X
-KEYWORDS=amd64 x86
-LICENSE=OFL-1.1
-REQUIRED_USE=^^ ( otf ttf )
-SLOT=0
-SRC_URI=https://github.com/IBM/plex/archive/v2.0.0.tar.gz -> ibm-plex-2.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f5b18609cf6e4201e10b0a72d4450df0
diff --git a/metadata/md5-cache/media-fonts/inconsolata-20140821 b/metadata/md5-cache/media-fonts/inconsolata-20140821
index 7bc95b96edeb..dd2309c938b8 100644
--- a/metadata/md5-cache/media-fonts/inconsolata-20140821
+++ b/metadata/md5-cache/media-fonts/inconsolata-20140821
@@ -1,13 +1,14 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A sans-serif monotype font for code listings
-EAPI=5
-HOMEPAGE=https://fonts.google.com/specimen/Inconsolata
+DESCRIPTION=Sans-serif monotype font for code listings
+EAPI=7
+HOMEPAGE=https://fonts.google.com/specimen/Inconsolata?preview.text_type=custom
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 ~arm64 ~ppc x86 ~ppc-macos ~x64-macos
 LICENSE=OFL-1.1
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/inconsolata-20140821.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c8e78a93f268985de0eb4dc44e865e98
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=8708ce3fa08d257fe92ce32fa0dc3133
diff --git a/metadata/md5-cache/media-fonts/inconsolata-hellenic-1.19-r1 b/metadata/md5-cache/media-fonts/inconsolata-hellenic-1.19-r1
index 4841d8798d3c..ff094972c593 100644
--- a/metadata/md5-cache/media-fonts/inconsolata-hellenic-1.19-r1
+++ b/metadata/md5-cache/media-fonts/inconsolata-hellenic-1.19-r1
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Hellenisation of the wonderful, monospace, open/free font Inconsolata
-EAPI=6
-HOMEPAGE=http://www.cosmix.org/software/
+EAPI=7
+HOMEPAGE=https://www.cosmix.org/software/
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=823a40f1abb3604d16ef3edd8995fa4d
+SRC_URI=https://www.cosmix.org/software/files/InconsolataHellenic.zip -> inconsolata-hellenic-1.19.zip
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=6406f2dad5ae8dad903081010cd66afe
diff --git a/metadata/md5-cache/media-fonts/infinality-ultimate-meta-1 b/metadata/md5-cache/media-fonts/infinality-ultimate-meta-1
index b77189df8676..64d6aedbc944 100644
--- a/metadata/md5-cache/media-fonts/infinality-ultimate-meta-1
+++ b/metadata/md5-cache/media-fonts/infinality-ultimate-meta-1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Meta package for infinality-ultimate with fonts
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=minimal +latin +free ms l10n_as l10n_bn l10n_bo l10n_brx l10n_doi l10n_dz l10n_gu l10n_hi l10n_ja l10n_km l10n_kn l10n_ko l10n_kok l10n_ks l10n_mai l10n_ml l10n_mr l10n_ne l10n_or l10n_pa l10n_sa l10n_sat l10n_sd l10n_si l10n_syc l10n_ta l10n_te l10n_zh
+IUSE=+free +latin minimal ms l10n_as l10n_bn l10n_bo l10n_brx l10n_doi l10n_dz l10n_gu l10n_hi l10n_ja l10n_km l10n_kn l10n_ko l10n_kok l10n_ks l10n_mai l10n_ml l10n_mr l10n_ne l10n_or l10n_pa l10n_sa l10n_sat l10n_sd l10n_si l10n_syc l10n_ta l10n_te l10n_zh
 KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=media-libs/fontconfig-ultimate free? ( media-fonts/noto media-fonts/heuristica media-fonts/liberation-fonts media-fonts/wqy-microhei latin? ( media-fonts/courier-prime media-fonts/dejavu media-fonts/signika media-fonts/tex-gyre !minimal? ( media-fonts/cantarell media-fonts/droid media-fonts/font-bh-ttf media-fonts/font-cursor-misc media-fonts/open-sans media-fonts/source-pro media-fonts/ubuntu-font-family media-fonts/urw-fonts ) ) l10n_brx? ( media-fonts/lohit-devanagari ) l10n_doi? ( media-fonts/lohit-devanagari ) l10n_dz? ( media-fonts/dzongkha-fonts ) l10n_hi? ( media-fonts/lohit-devanagari ) l10n_ja? ( media-fonts/ja-ipafonts ) l10n_km? ( media-fonts/khmer ) l10n_ko? ( media-fonts/unfonts ) l10n_kok? ( media-fonts/lohit-devanagari ) l10n_ks? ( media-fonts/lohit-devanagari ) l10n_mai? ( media-fonts/lohit-devanagari ) l10n_mr? ( media-fonts/lohit-devanagari ) l10n_ne? ( media-fonts/lohit-devanagari ) l10n_or? ( media-fonts/lohit-odia ) l10n_sa? ( media-fonts/lohit-devanagari ) l10n_sat? ( media-fonts/lohit-devanagari ) l10n_sd? ( media-fonts/lohit-devanagari ) l10n_si? ( media-fonts/lklug ) l10n_syc? ( media-fonts/font-misc-meltho ) !minimal? ( l10n_as? ( media-fonts/lohit-assamese ) l10n_bn? ( media-fonts/lohit-bengali ) l10n_bo? ( media-fonts/tibetan-machine-font ) l10n_gu? ( media-fonts/lohit-gujarati ) l10n_ja? ( media-fonts/ipaex media-fonts/koruri media-fonts/mplus-fonts media-fonts/vlgothic ) l10n_kn? ( media-fonts/lohit-kannada ) l10n_ko? ( media-fonts/nanum ) l10n_ml? ( media-fonts/lohit-malayalam ) l10n_mr? ( media-fonts/lohit-marathi ) l10n_ne? ( media-fonts/lohit-nepali ) l10n_pa? ( media-fonts/lohit-gurmukhi ) l10n_ta? ( media-fonts/lohit-tamil media-fonts/lohit-tamil-classical ) l10n_te? ( media-fonts/lohit-telugu ) l10n_zh? ( media-fonts/wqy-zenhei ) ) ) ms? ( media-fonts/corefonts !minimal? ( media-fonts/dejavu media-fonts/droid media-fonts/inconsolata media-fonts/open-sans media-fonts/paratype ) )
 SLOT=0
-_md5_=09cd83ff4968704b1d7e260fcb413248
+_md5_=d8c583d5bb83c0c7f867d8d4f98b77e2
diff --git a/metadata/md5-cache/media-fonts/iosevka-1.14.1 b/metadata/md5-cache/media-fonts/iosevka-1.14.1
index a2eec46a5a63..ef2ecce00fe1 100644
--- a/metadata/md5-cache/media-fonts/iosevka-1.14.1
+++ b/metadata/md5-cache/media-fonts/iosevka-1.14.1
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Slender typeface for code, from code
-EAPI=6
-HOMEPAGE=https://be5invis.github.io/Iosevka/
+EAPI=7
+HOMEPAGE=https://typeof.net/Iosevka/
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/be5invis/iosevka/releases/download/v1.14.1/01-iosevka-1.14.1.zip https://github.com/be5invis/iosevka/releases/download/v1.14.1/02-iosevka-term-1.14.1.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=05e043f4b0186463b5ce79d387a2bad6
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=8f2138243dc7d2a8c3ac6efb3591cf96
diff --git a/metadata/md5-cache/media-fonts/ipaex-002.01 b/metadata/md5-cache/media-fonts/ipaex-002.01
index 1961f7adb34e..0fa60f6bd9ff 100644
--- a/metadata/md5-cache/media-fonts/ipaex-002.01
+++ b/metadata/md5-cache/media-fonts/ipaex-002.01
@@ -1,13 +1,15 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Japanese IPA extended TrueType fonts
-EAPI=5
-HOMEPAGE=http://ipafont.ipa.go.jp/
+EAPI=7
+HOMEPAGE=https://ipafonts.osdn.jp/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=IPAfont
 RESTRICT=binchecks strip test
 SLOT=0
-SRC_URI=http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00201.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2dd4da127d84c35989c35080f417985e
+SRC_URI=https://osdn.mirror.liquidtelecom.com/ipafonts/57330/IPAexfont00201.zip
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=04f51f09dd7575c63215503239b01b16
diff --git a/metadata/md5-cache/media-fonts/ja-ipafonts-003.02-r1 b/metadata/md5-cache/media-fonts/ja-ipafonts-003.02-r1
deleted file mode 100644
index dc0738139c90..000000000000
--- a/metadata/md5-cache/media-fonts/ja-ipafonts-003.02-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=TrueType fonts developed by Japanese Information-technology Promotion Agency
-EAPI=5
-HOMEPAGE=http://ipafont.ipa.go.jp/
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=IPAfont
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=http://dl.ipafont.ipa.go.jp/IPAfont/IPAfont00302.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0e147683826ab2ead562f588ed809586
diff --git a/metadata/md5-cache/media-fonts/ja-ipafonts-003.03 b/metadata/md5-cache/media-fonts/ja-ipafonts-003.03
index 40f87f3ef71b..5f7437bc0040 100644
--- a/metadata/md5-cache/media-fonts/ja-ipafonts-003.03
+++ b/metadata/md5-cache/media-fonts/ja-ipafonts-003.03
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://ipafont.ipa.go.jp/
 INHERIT=font
 IUSE=X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=IPAfont
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://dl.ipafont.ipa.go.jp/IPAfont/IPAfont00303.zip
 _eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=5deae3517236acf3e0c7fe12a2297762
+_md5_=73cf2c1465e8669eb4b3e39952ea0d34
diff --git a/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r2 b/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r2
index dcea22a6e30e..b969945ac53e 100644
--- a/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r2
+++ b/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r2
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) X? ( media-gfx/ebdftopcf )
 DESCRIPTION=Japanese fixed fonts that cover JIS0213 charset
-EAPI=6
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=font font-ebdftopcf
 IUSE=X X
 KEYWORDS=~alpha amd64 arm ~ia64 ppc s390 sparc x86
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e64be557842e4108dd258380c0b97f94
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	font-ebdftopcf	55a13ddfd89119edce2c55e8bb8e5581
+_md5_=da69d5e35f88505c1e545ea734268066
diff --git a/metadata/md5-cache/media-fonts/jomolhari-0.003c b/metadata/md5-cache/media-fonts/jomolhari-0.003c
index 5fa5cd65d79f..a32592cc2fce 100644
--- a/metadata/md5-cache/media-fonts/jomolhari-0.003c
+++ b/metadata/md5-cache/media-fonts/jomolhari-0.003c
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Bhutanese style dbu-can font for Tibetan/Dzongkha text named after Mt Jomolhari
-EAPI=5
-HOMEPAGE=http://chris.fynn.googlepages.com/jomolhari
+EAPI=7
+HOMEPAGE=http://www.library.gov.bt/IT/fonts.html
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL
 SLOT=0
 SRC_URI=mirror://nongnu/free-tibetan/jomolhari/jomolhari-alpha3c.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=664fcc0b0222e9ff2f5076e32579ef05
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=c2618a62b4aed7fdaf2e5da82fc1d1ab
diff --git a/metadata/md5-cache/media-fonts/kacst-fonts-2.01 b/metadata/md5-cache/media-fonts/kacst-fonts-2.01
index 4004d458593d..3b4220fa8421 100644
--- a/metadata/md5-cache/media-fonts/kacst-fonts-2.01
+++ b/metadata/md5-cache/media-fonts/kacst-fonts-2.01
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=KACST Arabic TrueType Fonts
-EAPI=6
-HOMEPAGE=http://www.arabeyes.org/project.php?proj=Khotot
+EAPI=7
+HOMEPAGE=https://www.arabeyes.org/Khotot https://gitlab.com/arabeyes-art/khotot
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~s390 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/arabeyes/kacst_fonts_2.01.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fadc6a0559189f462a74a36e2aba20c0
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=9e7711e460513c3d98c18d9afd66a23c
diff --git a/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002 b/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002
index 66d0b45467a4..3ebe5d1a736b 100644
--- a/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002
+++ b/metadata/md5-cache/media-fonts/kanjistrokeorders-4.002
@@ -1,13 +1,15 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Font for viewing stroke order diagrams for kanji, kana and other characters
-EAPI=6
+EAPI=7
 HOMEPAGE=https://sites.google.com/site/nihilistorguk/
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 arm64 x86
 LICENSE=BSD
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v4.002.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f5310cf745558cfddf63ef65d09ac013
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=d38fdcdb85854db4ae25b68572127ec2
diff --git a/metadata/md5-cache/media-fonts/koruri-20161105 b/metadata/md5-cache/media-fonts/koruri-20161105
deleted file mode 100644
index efd9995ffc53..000000000000
--- a/metadata/md5-cache/media-fonts/koruri-20161105
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Japanese TrueType font based on M+ outline fonts and Open Sans
-EAPI=5
-HOMEPAGE=http://sourceforge.jp/projects/koruri/
-IUSE=X
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=mplus-fonts Apache-2.0
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/koruri/66647/Koruri-20161105.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ceb6c14b9a333adb89bd41002b702296
diff --git a/metadata/md5-cache/media-fonts/koruri-20180915 b/metadata/md5-cache/media-fonts/koruri-20180915
new file mode 100644
index 000000000000..2987c3718e42
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/koruri-20180915
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=Japanese TrueType font based on M+ outline fonts and Open Sans
+EAPI=7
+HOMEPAGE=https://koruri.github.io/
+INHERIT=font
+IUSE=X
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=mplus-fonts Apache-2.0
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/Koruri/Koruri/releases/download/Koruri-20180915/Koruri-20180915.tar.xz
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=c32672445843add4f7a5dbda4cc25770
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 7cf315290fa8..0257216f7641 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,13 +1,14 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Fonts from the Linux Libertine Open Fonts Project
-EAPI=6
-HOMEPAGE=http://linuxlibertine.org/
+EAPI=7
+HOMEPAGE=http://libertine-fonts.org/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86
 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	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6ded137bd1016cd62d3c0ea4d9a9a007
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=0c1939cffd2665912e77c7f75e7e3b32
diff --git a/metadata/md5-cache/media-fonts/lklug-0.6-r1 b/metadata/md5-cache/media-fonts/lklug-0.6-r1
index 7ef9b5c3ea67..645b8e588a9e 100644
--- a/metadata/md5-cache/media-fonts/lklug-0.6-r1
+++ b/metadata/md5-cache/media-fonts/lklug-0.6-r1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Sinhala font
-EAPI=6
-HOMEPAGE=http://sinhala.sourceforge.net
+DESCRIPTION=Unicode Sinhala font
+EAPI=7
+HOMEPAGE=http://sinhala.sourceforge.net/
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6d31b686b6d20f59156ebd679652bef7
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=07016dff396efd487e709a11b2b77d15
diff --git a/metadata/md5-cache/media-fonts/lohit-assamese-2.91.5 b/metadata/md5-cache/media-fonts/lohit-assamese-2.91.5
index 1e68dad3105f..dead3cb18bd3 100644
--- a/metadata/md5-cache/media-fonts/lohit-assamese-2.91.5
+++ b/metadata/md5-cache/media-fonts/lohit-assamese-2.91.5
@@ -1,8 +1,9 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Assamese font
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pagure.io/lohit
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-assamese-ttf-2.91.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=caa9dda7f0c306869d421d13890e1930
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=48bde2dac5e24bbf5f389776876953ea
diff --git a/metadata/md5-cache/media-fonts/lohit-bengali-2.91.5 b/metadata/md5-cache/media-fonts/lohit-bengali-2.91.5
index 72cd14688cb4..7dde06fba1fa 100644
--- a/metadata/md5-cache/media-fonts/lohit-bengali-2.91.5
+++ b/metadata/md5-cache/media-fonts/lohit-bengali-2.91.5
@@ -1,8 +1,9 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Bengali font
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pagure.io/lohit
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-bengali-ttf-2.91.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9907d90e9e90caecd719fd9748ee2e26
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=24e584a43af01963062f6cbf2daa59ed
diff --git a/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.4 b/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.4
index 62b6910157c4..8fc8ade5234e 100644
--- a/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.4
+++ b/metadata/md5-cache/media-fonts/lohit-devanagari-2.95.4
@@ -1,8 +1,9 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Devanagari font
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pagure.io/lohit
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-devanagari-ttf-2.95.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dc2c618ec8a319d1aa0c3c4681a1e813
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=55a9849cbe704308291be8a3c20db6a6
diff --git a/metadata/md5-cache/media-fonts/lohit-gujarati-2.92.4 b/metadata/md5-cache/media-fonts/lohit-gujarati-2.92.4
index 46a7a407f14b..f617b9911b4c 100644
--- a/metadata/md5-cache/media-fonts/lohit-gujarati-2.92.4
+++ b/metadata/md5-cache/media-fonts/lohit-gujarati-2.92.4
@@ -1,8 +1,9 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Gujarati font
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pagure.io/lohit
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-gujarati-ttf-2.92.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f81c5db9d64e4cf68c3ea917163aea43
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=1cdd176938987b9dfb157262c6cf165d
diff --git a/metadata/md5-cache/media-fonts/lohit-gurmukhi-2.91.2 b/metadata/md5-cache/media-fonts/lohit-gurmukhi-2.91.2
index 158a12dc349a..6f4a8f71f7f4 100644
--- a/metadata/md5-cache/media-fonts/lohit-gurmukhi-2.91.2
+++ b/metadata/md5-cache/media-fonts/lohit-gurmukhi-2.91.2
@@ -1,8 +1,9 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Gurmukhi font
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pagure.io/lohit
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-gurmukhi-ttf-2.91.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=824c4f6d17369e010b007a2a38f98ec9
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=8edb6a7a3b2c652e305b003dd2a0de62
diff --git a/metadata/md5-cache/media-fonts/lohit-kannada-2.5.4 b/metadata/md5-cache/media-fonts/lohit-kannada-2.5.4
index 49281f469721..6d20c4007be2 100644
--- a/metadata/md5-cache/media-fonts/lohit-kannada-2.5.4
+++ b/metadata/md5-cache/media-fonts/lohit-kannada-2.5.4
@@ -1,8 +1,9 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Kannada font
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pagure.io/lohit
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-kannada-ttf-2.5.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ee59e1d250eeac884474f67753197a62
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=6932a76d12b0752c1615a1b58ad059a3
diff --git a/metadata/md5-cache/media-fonts/lohit-malayalam-2.92.2 b/metadata/md5-cache/media-fonts/lohit-malayalam-2.92.2
index 0947a8917f26..ed7db569bbde 100644
--- a/metadata/md5-cache/media-fonts/lohit-malayalam-2.92.2
+++ b/metadata/md5-cache/media-fonts/lohit-malayalam-2.92.2
@@ -1,8 +1,9 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Malayalam font
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pagure.io/lohit
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-malayalam-ttf-2.92.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9d77977396e82cc80d466b902e767e1e
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=e4047d5c15e942811b3c20d1030df17b
diff --git a/metadata/md5-cache/media-fonts/lohit-marathi-2.94.2 b/metadata/md5-cache/media-fonts/lohit-marathi-2.94.2
index 244e391c1b08..38d5c1f4ccc8 100644
--- a/metadata/md5-cache/media-fonts/lohit-marathi-2.94.2
+++ b/metadata/md5-cache/media-fonts/lohit-marathi-2.94.2
@@ -1,8 +1,9 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Marathi font
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pagure.io/lohit
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-marathi-ttf-2.94.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ba6bd36d715e0590deb208c4680ebfe9
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=e22c0f80fd8cde23708a86b52c524798
diff --git a/metadata/md5-cache/media-fonts/lohit-nepali-2.94.2 b/metadata/md5-cache/media-fonts/lohit-nepali-2.94.2
index 25a5ef4693a7..19b8fc90329f 100644
--- a/metadata/md5-cache/media-fonts/lohit-nepali-2.94.2
+++ b/metadata/md5-cache/media-fonts/lohit-nepali-2.94.2
@@ -1,8 +1,9 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Nepali font
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pagure.io/lohit
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-nepali-ttf-2.94.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e7d678ee0413bede716565f09cbfa025
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=c832b89064d1df05c8a38a5fab417f7f
diff --git a/metadata/md5-cache/media-fonts/lohit-odia-2.91.2 b/metadata/md5-cache/media-fonts/lohit-odia-2.91.2
index ccdd205d7148..04fc19979bfa 100644
--- a/metadata/md5-cache/media-fonts/lohit-odia-2.91.2
+++ b/metadata/md5-cache/media-fonts/lohit-odia-2.91.2
@@ -1,8 +1,9 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Odia font
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pagure.io/lohit
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-odia-ttf-2.91.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1bd03450dfccda6df8ae556f9d480b8c
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=b9a8d8da4fedee8506f00406b8a42038
diff --git a/metadata/md5-cache/media-fonts/lohit-tamil-2.91.3 b/metadata/md5-cache/media-fonts/lohit-tamil-2.91.3
index 6bc75eb54780..38467ac20e99 100644
--- a/metadata/md5-cache/media-fonts/lohit-tamil-2.91.3
+++ b/metadata/md5-cache/media-fonts/lohit-tamil-2.91.3
@@ -1,8 +1,9 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Tamil font
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pagure.io/lohit
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-tamil-ttf-2.91.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=035b3573f4eeb1380b72959b5e7365bd
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=3385365d5be8a1dbc615e109c6b7c1ca
diff --git a/metadata/md5-cache/media-fonts/lohit-tamil-classical-2.5.4 b/metadata/md5-cache/media-fonts/lohit-tamil-classical-2.5.4
index 9ab179a9c2cf..926a59429612 100644
--- a/metadata/md5-cache/media-fonts/lohit-tamil-classical-2.5.4
+++ b/metadata/md5-cache/media-fonts/lohit-tamil-classical-2.5.4
@@ -1,8 +1,9 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Tamil Classical font
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pagure.io/lohit
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-tamil-classical-ttf-2.5.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d272a6d5179208668ef8fd9717dcc81a
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=b672464a85d8c8f1a9267ee088252909
diff --git a/metadata/md5-cache/media-fonts/lohit-telugu-2.5.5 b/metadata/md5-cache/media-fonts/lohit-telugu-2.5.5
index 032605078559..d67341816502 100644
--- a/metadata/md5-cache/media-fonts/lohit-telugu-2.5.5
+++ b/metadata/md5-cache/media-fonts/lohit-telugu-2.5.5
@@ -1,8 +1,9 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=!<media-fonts/lohit-fonts-2.20150220 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=The Lohit Telugu font
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pagure.io/lohit
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=!<media-fonts/lohit-fonts-2.20150220
 RESTRICT=test binchecks
 SLOT=0
 SRC_URI=https://releases.pagure.org/lohit/lohit-telugu-ttf-2.5.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=25683a99772123d1d2f5f5a32053931a
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=2548e761bc9bd0234570af7a23bf44ac
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 1517624d5ef3..c4646f7d547d 100644
--- a/metadata/md5-cache/media-fonts/mix-mplus-ipa-20130617-r1
+++ b/metadata/md5-cache/media-fonts/mix-mplus-ipa-20130617-r1
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Mixing mplus and IPA fonts
-EAPI=6
-HOMEPAGE=http://mix-mplus-ipa.sourceforge.jp/
+EAPI=7
+HOMEPAGE=https://mix-mplus-ipa.osdn.jp/
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~x86
 LICENSE=mplus-fonts IPAfont
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-1m-20130617.zip mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-1p-20130617.zip mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-2m-20130617.zip mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-2p-20130617.zip mirror://sourceforge.jp/mix-mplus-ipa/59022/migu-1p-20130617.zip mirror://sourceforge.jp/mix-mplus-ipa/59022/migu-1c-20130617.zip mirror://sourceforge.jp/mix-mplus-ipa/59022/migu-1m-20130617.zip mirror://sourceforge.jp/mix-mplus-ipa/59022/migu-2m-20130617.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6f4c5f1ea78c9a854a5bdcf8cf82c7ad
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=214fb04849308fb8947b0b2760106bc5
diff --git a/metadata/md5-cache/media-fonts/monafont-2.90-r2 b/metadata/md5-cache/media-fonts/monafont-2.90-r2
index 439df54282e7..e9ee4bc6ff6b 100644
--- a/metadata/md5-cache/media-fonts/monafont-2.90-r2
+++ b/metadata/md5-cache/media-fonts/monafont-2.90-r2
@@ -3,7 +3,8 @@ DEFINED_PHASES=compile install postinst postrm prepare setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Japanese bitmap and TrueType fonts suitable for browsing 2ch
 EAPI=7
-HOMEPAGE=http://monafont.sourceforge.net
+HOMEPAGE=http://monafont.sourceforge.net/
+INHERIT=font
 IUSE=truetype X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=public-domain
@@ -11,4 +12,4 @@ RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/monafont/monafont-2.90.tar.bz2 truetype? ( mirror://sourceforge/monafont/monafont-ttf-2.90.zip )
 _eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=5a9185d9ee22cfdf1e09668a3150962a
+_md5_=1dd6c5c6b8c6b150824f69a6fbb5191c
diff --git a/metadata/md5-cache/media-fonts/monoid-0.61 b/metadata/md5-cache/media-fonts/monoid-0.61
index 68325a0728f0..7fd974c82bde 100644
--- a/metadata/md5-cache/media-fonts/monoid-0.61
+++ b/metadata/md5-cache/media-fonts/monoid-0.61
@@ -1,13 +1,14 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Open source coding font
-EAPI=5
+EAPI=7
 HOMEPAGE=https://larsenwork.com/monoid/ https://github.com/larsenwork/monoid
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/monoid-0.61.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=da4071e115b1bd7505b68a69d276e752
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=a91a461a604a0f61614d5ccbce7c9882
diff --git a/metadata/md5-cache/media-fonts/montecarlo-0-r1 b/metadata/md5-cache/media-fonts/montecarlo-0-r1
index 506c1e062349..5fc555f46ba8 100644
--- a/metadata/md5-cache/media-fonts/montecarlo-0-r1
+++ b/metadata/md5-cache/media-fonts/montecarlo-0-r1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=monospace font, created by programmers, for programmers
-EAPI=6
-HOMEPAGE=http://www.bok.net/MonteCarlo/
+DESCRIPTION=Monospace font, created by programmers, for programmers
+EAPI=7
+HOMEPAGE=https://www.bok.net/MonteCarlo/
+INHERIT=font
 IUSE=bdf X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c7a0370c3c597798e3efcb107e5219b5
+SRC_URI=https://www.bok.net/MonteCarlo/downloads/MonteCarlo-PCF.tgz bdf? ( https://www.bok.net/MonteCarlo/downloads/MonteCarlo-BDF.tgz )
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=8aec8eceaa25296a9cc42d1a37fcc318
diff --git a/metadata/md5-cache/media-fonts/mplus-fonts-2.2.4-r1 b/metadata/md5-cache/media-fonts/mplus-fonts-2.2.4-r1
index 3868d5850bfa..a63b261297f4 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,13 +1,15 @@
+BDEPEND=x11-apps/bdftopcf >=x11-apps/mkfontscale-1.2.0
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=>=x11-apps/mkfontscale-1.2.0 x11-apps/bdftopcf X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=M+ Japanese bitmap fonts
-EAPI=6
-HOMEPAGE=http://mplus-fonts.sourceforge.jp/
+EAPI=7
+HOMEPAGE=https://mplus-fonts.osdn.jp/about-en.html
+INHERIT=font
 IUSE=X X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a55e0b9a62ac4ac5c0f0bf53f784119f
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=d299e7357a8c0dbc636cf70a74ba40f0
diff --git a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre063_p1 b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre063_p1
index 73eaaaf72758..e0e58fdc54a4 100644
--- a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre063_p1
+++ b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre063_p1
@@ -1,13 +1,15 @@
+BDEPEND=ipafont? ( media-fonts/ja-ipafonts media-gfx/fontforge )
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=ipafont? ( media-gfx/fontforge media-fonts/ja-ipafonts ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=M+ Japanese outline fonts
-EAPI=6
-HOMEPAGE=http://mplus-fonts.osdn.jp/ http://ossipedia.ipa.go.jp/ipafont/
+EAPI=7
+HOMEPAGE=https://mplus-fonts.osdn.jp/about-en.html
+INHERIT=font
 IUSE=ipafont X
 KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos
 LICENSE=mplus-fonts ipafont? ( IPAfont )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/mplus-fonts/62344/mplus-TESTFLIGHT-063a.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f35ae0c69950fc06a6a60606102b66bb
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=9f389c9a6164d29eb2d75c5d6c7133fa
diff --git a/metadata/md5-cache/media-fonts/nanum-3.0 b/metadata/md5-cache/media-fonts/nanum-3.0
index a58b3193f069..075c77f6b284 100644
--- a/metadata/md5-cache/media-fonts/nanum-3.0
+++ b/metadata/md5-cache/media-fonts/nanum-3.0
@@ -1,13 +1,14 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=The Nanum Korean fonts distributed by Naver
-EAPI=5
-HOMEPAGE=http://hangeul.naver.com/2014/nanum
+DESCRIPTION=Korean fonts distributed by Naver
+EAPI=7
+HOMEPAGE=https://hangeul.naver.com/2017/nanum
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~x86
 LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/nanum-3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4ec4fbfb7fa192fee93a1c0f86036d54
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=954a18dad9f7e437366cc6b6d1b9502b
diff --git a/metadata/md5-cache/media-fonts/nanumfont-2.0-r2 b/metadata/md5-cache/media-fonts/nanumfont-2.0-r2
index 1c2f026c31ca..5f580b5c5fc4 100644
--- a/metadata/md5-cache/media-fonts/nanumfont-2.0-r2
+++ b/metadata/md5-cache/media-fonts/nanumfont-2.0-r2
@@ -1,13 +1,15 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Korean monospace font distributed by NHN
-EAPI=6
-HOMEPAGE=http://dev.naver.com/projects/nanumfont
+EAPI=7
+HOMEPAGE=https://developers.naver.com/projects/nanumfont
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 x86
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9a2663c74c6be10294558f3d8a6dd738
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=35ad2272b1f10102261e66bbbb503a48
diff --git a/metadata/md5-cache/media-fonts/noto-20190524 b/metadata/md5-cache/media-fonts/noto-20190524
deleted file mode 100644
index 3890e3e34337..000000000000
--- a/metadata/md5-cache/media-fonts/noto-20190524
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Google's font family that aims to support all the world's languages
-EAPI=6
-HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts
-IUSE=cjk +extra X
-KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86
-LICENSE=OFL-1.1
-RDEPEND=cjk? ( media-fonts/noto-cjk )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/googlei18n/noto-fonts/archive/34e98229863e627d0f841e124a8657d5d0348b04.tar.gz -> noto-20190524.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd842195303dbe4fdf175dbdb86994a3
diff --git a/metadata/md5-cache/media-fonts/noto-20200308 b/metadata/md5-cache/media-fonts/noto-20200308
deleted file mode 100644
index d9741fab6590..000000000000
--- a/metadata/md5-cache/media-fonts/noto-20200308
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Google's font family that aims to support all the world's languages
-EAPI=7
-HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts
-IUSE=cjk +extra X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=OFL-1.1
-RDEPEND=cjk? ( media-fonts/noto-cjk )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/googlei18n/noto-fonts/archive/1c9f53362889d4468fd1193b76c397c208d81da8.tar.gz -> noto-20200308.tar.gz
-_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=c65db1cf49cc0ac20402f1a5c39efe9f
diff --git a/metadata/md5-cache/media-fonts/noto-cjk-20190416 b/metadata/md5-cache/media-fonts/noto-cjk-20190416
index d36c716dfa19..2d72ec19c489 100644
--- a/metadata/md5-cache/media-fonts/noto-cjk-20190416
+++ b/metadata/md5-cache/media-fonts/noto-cjk-20190416
@@ -1,13 +1,14 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Google's CJK font family
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-cjk
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86
 LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlei18n/noto-cjk/archive/be6c059ac1587e556e2412b27f5155c8eb3ddbe6.tar.gz -> noto-cjk-20190416.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3d6c40be22926a099a489a7e098e8627
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=b7344e0c74831ffd75c17083d3c945ac
diff --git a/metadata/md5-cache/media-fonts/nunito-1.0-r1 b/metadata/md5-cache/media-fonts/nunito-1.0-r1
index 8a86d16f5176..82941b3bfdee 100644
--- a/metadata/md5-cache/media-fonts/nunito-1.0-r1
+++ b/metadata/md5-cache/media-fonts/nunito-1.0-r1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 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
+DESCRIPTION=Sans Serif font with rounded terminals
+EAPI=7
+HOMEPAGE=https://fonts.google.com/specimen/Nunito?preview.text_type=custom https://github.com/vernnobile/NunitoFont
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/nunito-1.0.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f5999cfaed84c9c9469b7024159076aa
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=e984b4583831ee3551a93e6670bcf2b7
diff --git a/metadata/md5-cache/media-fonts/nuosu-sil-2.1.1 b/metadata/md5-cache/media-fonts/nuosu-sil-2.1.1
deleted file mode 100644
index 2e8bef8d1cda..000000000000
--- a/metadata/md5-cache/media-fonts/nuosu-sil-2.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Unicode font for the standardized Yi script
-EAPI=5
-HOMEPAGE=http://scripts.sil.org/SILYi_home
-IUSE=X
-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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=06dbaec75766e871f23cab7f24d52d80
diff --git a/metadata/md5-cache/media-fonts/nuosu-sil-2.200 b/metadata/md5-cache/media-fonts/nuosu-sil-2.200
new file mode 100644
index 000000000000..13efead15ca5
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/nuosu-sil-2.200
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=Unicode font for the standardized Yi script
+EAPI=7
+HOMEPAGE=https://software.sil.org/nuosu/
+INHERIT=font
+IUSE=X
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=OFL-1.1
+SLOT=0
+SRC_URI=https://software.sil.org/downloads/r/nuosu/NuosuSIL-2.200.zip
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=eaa4fa80a47456784a4ccdda4b765609
diff --git a/metadata/md5-cache/media-fonts/ohsnap-1.8.0 b/metadata/md5-cache/media-fonts/ohsnap-1.8.0
index 36dcd1a733e9..6dc289fb371f 100644
--- a/metadata/md5-cache/media-fonts/ohsnap-1.8.0
+++ b/metadata/md5-cache/media-fonts/ohsnap-1.8.0
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=The ohsnap / osnap monospace font (based on Artwiz Snap)
-EAPI=5
+DESCRIPTION=Monospace font based on Artwiz Snap with bold and versions with status icons
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/osnapfont
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/osnapfont/ohsnap-1.8.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fe2d6f4ba37ad9127363d9445435bfe8
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=4da0bcdb71e4ab2c4c8aa0b805fb445f
diff --git a/metadata/md5-cache/media-fonts/open-sans-1 b/metadata/md5-cache/media-fonts/open-sans-1
deleted file mode 100644
index efc89e3533f2..000000000000
--- a/metadata/md5-cache/media-fonts/open-sans-1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Clean and modern sans-serif typeface designed for legibility across interfaces
-EAPI=5
-HOMEPAGE=https://www.opensans.com/
-IUSE=X
-KEYWORDS=amd64 arm x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jstein/dist/open-sans-1.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4daf5f7add7f7f3df3f6be4b42f76d06
diff --git a/metadata/md5-cache/media-fonts/open-sans-1-r1 b/metadata/md5-cache/media-fonts/open-sans-1-r1
index 89d67af971ef..1c54e84c90de 100644
--- a/metadata/md5-cache/media-fonts/open-sans-1-r1
+++ b/metadata/md5-cache/media-fonts/open-sans-1-r1
@@ -1,13 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Clean and modern sans-serif typeface designed for legibility across interfaces
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.opensans.com/
 INHERIT=font
 IUSE=X
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/open-sans-1.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=445640f6fb2a0e66830b4ff681770d00
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=444a8310f7e6f4e81844e8159159c605
diff --git a/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2 b/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2
deleted file mode 100644
index b9b6a2e9d537..000000000000
--- a/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Chinese TrueType Fonts
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86
-LICENSE=Arphic
-SLOT=0
-SRC_URI=mirror://gentoo/opendesktop-fonts-1.4.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f82f2dec87e2dc44a0bab006be5aee97
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 a8af40bd7919..af9d510882b0 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
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=font
 IUSE=X
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86
 LICENSE=Arphic
 SLOT=0
 SRC_URI=mirror://gentoo/opendesktop-fonts-1.4.2.tar.gz
 _eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=969e7d82c26c32de6d9d433b6ee6d5e4
+_md5_=73a5a04b97de7e63ce87942e6f40c0fa
diff --git a/metadata/md5-cache/media-fonts/paratype-2.5 b/metadata/md5-cache/media-fonts/paratype-2.5
index 8c41993d3551..faa210b0cea7 100644
--- a/metadata/md5-cache/media-fonts/paratype-2.5
+++ b/metadata/md5-cache/media-fonts/paratype-2.5
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=ParaType font collection for languages of Russia
-EAPI=5
-HOMEPAGE=https://www.paratype.com/public/
+EAPI=7
+HOMEPAGE=https://company.paratype.com/pt-sans-pt-serif
+INHERIT=font
 IUSE=X X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9f0df6e91ca1dd04e876e11aec404329
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=0288158e0156e5cf8d768801b8bcaee9
diff --git a/metadata/md5-cache/media-fonts/paratype-astra-1001 b/metadata/md5-cache/media-fonts/paratype-astra-1001
index 7403c2ee76b2..0a25749f8113 100644
--- a/metadata/md5-cache/media-fonts/paratype-astra-1001
+++ b/metadata/md5-cache/media-fonts/paratype-astra-1001
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=ParaType Astra Sans/Serif fonts metrically compatible with Times New Roman
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.paratype.ru/cinfo/news.asp?NewsId=3469
+INHERIT=font
 IUSE=X X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c6d039e40053601ceeccf2cb52d51f87
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=1703af67347cd28de25ea37a99d2a478
diff --git a/metadata/md5-cache/media-fonts/pigiarniq-2 b/metadata/md5-cache/media-fonts/pigiarniq-2
index 0885f24b8c20..b4c685c6fb43 100644
--- a/metadata/md5-cache/media-fonts/pigiarniq-2
+++ b/metadata/md5-cache/media-fonts/pigiarniq-2
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Nunavut's official Inuktitut font
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.ch.gov.nu.ca/en/ComputerTools.aspx
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://ch.gov.nu.ca/fonts/pigiarniq.zip -> pigiarniq-2.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9912fe51956d3234fdcc5bd3e9f1342c
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=5a0d1d2887b1e88c660d2497a8311941
diff --git a/metadata/md5-cache/media-fonts/powerline-symbols-20170508 b/metadata/md5-cache/media-fonts/powerline-symbols-20170508
index fd06c273af12..5fdba36f6b2e 100644
--- a/metadata/md5-cache/media-fonts/powerline-symbols-20170508
+++ b/metadata/md5-cache/media-fonts/powerline-symbols-20170508
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=OpenType Unicode font with symbols for Powerline/Airline
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/powerline/powerline
 INHERIT=font
 IUSE=X
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=MIT-with-advertising
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/powerline-symbols-20170508.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=7ab0db8c59db3f5840febb62b7347f48
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=7f3fd120a6a3a3873cb54cfd39ccec65
diff --git a/metadata/md5-cache/media-fonts/qomolangma-2012.05 b/metadata/md5-cache/media-fonts/qomolangma-2012.05
index 12883e8b39a6..8de5cbd71806 100644
--- a/metadata/md5-cache/media-fonts/qomolangma-2012.05
+++ b/metadata/md5-cache/media-fonts/qomolangma-2012.05
@@ -1,12 +1,14 @@
+BDEPEND=|| ( app-arch/unrar app-arch/rar )
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=|| ( app-arch/unrar app-arch/rar ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Tibetan Unicode Ucan and Umed fonts
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.yalasoo.com/English/docs/yalasoo_en_font.html
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=free-noncomm
 SLOT=0
 SRC_URI=http://www.yalasoo.com/files/CTRCfonts.rar -> qomolangma-2012.05.rar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=31817a42c803d4e69e80cc295b3d7386
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=af62c37c36d4f873ba7648196e656350
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 117ec59b7a37..a1aacea722ee 100644
--- a/metadata/md5-cache/media-fonts/ricty-3.2.0-r2
+++ b/metadata/md5-cache/media-fonts/ricty-3.2.0-r2
@@ -1,13 +1,15 @@
+BDEPEND=media-fonts/inconsolata >=media-fonts/mix-mplus-ipa-20111002 media-gfx/fontforge
 DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=media-fonts/inconsolata >=media-fonts/mix-mplus-ipa-20111002 media-gfx/fontforge X? ( >=x11-apps/mkfontscale-1.2.0 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
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=Beautiful sans-serif monotype Japanese font designed for code listings
+EAPI=7
+HOMEPAGE=https://rictyfonts.github.io/
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~x86
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9743a4a4c104dab48bfa58151f0f6455
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=a2d1a8bf322fb5090a25ea806a226249
diff --git a/metadata/md5-cache/media-fonts/roboto-2.138 b/metadata/md5-cache/media-fonts/roboto-2.138
index 9a9f9a420930..89b04b972669 100644
--- a/metadata/md5-cache/media-fonts/roboto-2.138
+++ b/metadata/md5-cache/media-fonts/roboto-2.138
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Standard font for Android 4.0 (Ice Cream Sandwich) and later
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/google/roboto
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d54e01f90e363f6bf8beb88123e3eb7a
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=3c07c4c499ca435c5966c035ae70fa3a
diff --git a/metadata/md5-cache/media-fonts/signika-1.001 b/metadata/md5-cache/media-fonts/signika-1.001
index 95ca42532a2f..69d298a99c4e 100644
--- a/metadata/md5-cache/media-fonts/signika-1.001
+++ b/metadata/md5-cache/media-fonts/signika-1.001
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A sans-serif with gentle character designed for signage
-EAPI=5
+DESCRIPTION=Sans-serif with gentle character designed for signage
+EAPI=7
 HOMEPAGE=http://ancymonic.com/projects/Signika
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=186d6893a9c57f1d9bfef28613399320
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=ba6c4e8ee7ecb2c16bf4a21b646b9c2a
diff --git a/metadata/md5-cache/media-fonts/sil-abyssinica-1.500 b/metadata/md5-cache/media-fonts/sil-abyssinica-1.500
index d04548b3c03b..60bf25824f22 100644
--- a/metadata/md5-cache/media-fonts/sil-abyssinica-1.500
+++ b/metadata/md5-cache/media-fonts/sil-abyssinica-1.500
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=SIL Opentype Unicode fonts for Ethiopic languages
-EAPI=6
-HOMEPAGE=https://software.sil.org/abyssinica
+EAPI=7
+HOMEPAGE=https://software.sil.org/abyssinica/
+INHERIT=font
 IUSE=doc X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-1.500.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=df4b7f3e755008db7c862a981df3fc82
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=f913091b83bb8c5307368916323f6957
diff --git a/metadata/md5-cache/media-fonts/sil-arabicfonts-3.000 b/metadata/md5-cache/media-fonts/sil-arabicfonts-3.000
new file mode 100644
index 000000000000..69f92682b277
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/sil-arabicfonts-3.000
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst postrm setup unpack
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=SIL Opentype Unicode fonts for Arabic Languages
+EAPI=7
+HOMEPAGE=https://software.sil.org/arabicfonts/
+INHERIT=font
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=OFL-1.1
+SLOT=0
+SRC_URI=https://software.sil.org/downloads/r/scheherazade/ScheherazadeNew-3.000.zip https://software.sil.org/downloads/r/lateef/LateefGR-1.200.zip
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=47adfb148ea5b82e4c272ac8159e394c
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 d105364fbae5..c2fa6ba083b0 100644
--- a/metadata/md5-cache/media-fonts/sil-charis-5.000-r1
+++ b/metadata/md5-cache/media-fonts/sil-charis-5.000-r1
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Serif typeface for Roman and Cyrillic languages
-EAPI=6
-HOMEPAGE=http://scripts.sil.org/CharisSILfont
+EAPI=7
+HOMEPAGE=https://software.sil.org/charis/
+INHERIT=font
 IUSE=compact X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7e3a35c92e0e71becb6744f0a7b2d38c
+SRC_URI=https://software.sil.org/downloads/r/charis/CharisSIL-5.000.zip -> sil-charis-5.000.zip compact? ( https://software.sil.org/downloads/r/charis/CharisSILCompact-5.000.zip )
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=c3b2f2c80124b0be35a9a9b0769850aa
diff --git a/metadata/md5-cache/media-fonts/sil-doulos-5.000-r1 b/metadata/md5-cache/media-fonts/sil-doulos-5.000-r1
index c1e09ed4e1d5..145753fd9bcc 100644
--- a/metadata/md5-cache/media-fonts/sil-doulos-5.000-r1
+++ b/metadata/md5-cache/media-fonts/sil-doulos-5.000-r1
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=SIL Doulos - SIL font for Roman and Cyrillic Languages
-EAPI=6
-HOMEPAGE=http://scripts.sil.org/DoulosSILfont
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=SIL font for Roman and Cyrillic Languages
+EAPI=7
+HOMEPAGE=https://software.sil.org/doulos/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6b9725c37b3817074fe8de24cb474022
+SRC_URI=https://software.sil.org/downloads/r/doulos/DoulosSIL-5.000.zip -> sil-doulos-5.000.zip
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=2ab014eb36206cba9d41c318e676ba33
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 8eb2a18cd335..2cc08d90427b 100644
--- a/metadata/md5-cache/media-fonts/sil-gentium-5.000-r1
+++ b/metadata/md5-cache/media-fonts/sil-gentium-5.000-r1
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Gentium Plus unicode font for Latin and Greek languages
-EAPI=6
-HOMEPAGE=http://scripts.sil.org/gentium
+EAPI=7
+HOMEPAGE=https://software.sil.org/gentium/
+INHERIT=font
 IUSE=compact doc X
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=46a5bead62a1e128a579ace312390d82
+SRC_URI=https://software.sil.org/downloads/r/gentium/GentiumPlus-5.000.zip -> sil-gentium-5.000.zip compact? ( https://software.sil.org/downloads/r/gentium/GentiumPlusCompact-5.000.zip )
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=a2171247036830b192fb0355c03a2a77
diff --git a/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1 b/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1
index 92eaba27975b..f7b488c8d7b3 100644
--- a/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1
+++ b/metadata/md5-cache/media-fonts/sil-padauk-2.8-r1
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=SIL fonts for Myanmar script
-EAPI=6
+EAPI=7
 HOMEPAGE=http://scripts.sil.org/padauk
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=OFL
 SLOT=0
 SRC_URI=mirror://gentoo/padauk-2.8.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=aed03e79e76b9b8e0d636b8502f080e6
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=4d7f179e4fd2a831e4ce8b8e16648ccf
diff --git a/metadata/md5-cache/media-fonts/sil-padauk-4.000 b/metadata/md5-cache/media-fonts/sil-padauk-4.000
new file mode 100644
index 000000000000..e92a7cc8aecf
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/sil-padauk-4.000
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=SIL fonts for Myanmar script
+EAPI=7
+HOMEPAGE=https://software.sil.org/padauk/
+INHERIT=font
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=OFL
+SLOT=0
+SRC_URI=https://software.sil.org/downloads/r/padauk/Padauk-4.000.zip
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=d6ba581ea1d87161a5cf8041565280c6
diff --git a/metadata/md5-cache/media-fonts/sophia-nubian-1.0 b/metadata/md5-cache/media-fonts/sophia-nubian-1.0
index c3c59dd608a8..1c35056205e8 100644
--- a/metadata/md5-cache/media-fonts/sophia-nubian-1.0
+++ b/metadata/md5-cache/media-fonts/sophia-nubian-1.0
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Unicode sans-serif typeface for Coptic/Nubian languages
-EAPI=5
-HOMEPAGE=http://scripts.sil.org/SophiaNubian
+EAPI=7
+HOMEPAGE=https://software.sil.org/SophiaNubian/
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=96a61a3d06b7faee663749de32ba0c4d
+SRC_URI=https://software.sil.org/downloads/r/sophianubian/SophiaNubian-1.0.zip -> sophia-nubian-1.0.zip
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=0ee40982e3c330e45dfbdde60911996c
diff --git a/metadata/md5-cache/media-fonts/source-han-sans-1.001 b/metadata/md5-cache/media-fonts/source-han-sans-1.001
deleted file mode 100644
index 79316da895d0..000000000000
--- a/metadata/md5-cache/media-fonts/source-han-sans-1.001
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Pan-CJK OpenType/CFF font family
-EAPI=5
-HOMEPAGE=https://github.com/adobe-fonts/source-han-sans/
-IUSE=l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW X
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b3e4a4c17106445509cfe9ac6deb0bca
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 47f3f891a586..5a1f34b4a30f 100644
--- a/metadata/md5-cache/media-fonts/source-han-sans-1.004
+++ b/metadata/md5-cache/media-fonts/source-han-sans-1.004
@@ -1,15 +1,16 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Pan-CJK OpenType/CFF font family
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/adobe-fonts/source-han-sans/
 INHERIT=font
 IUSE=l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW X
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=a4a4136460c3187d9d69fcda8df6e6d1
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=a45cce0c31621ee8c777057a32cfad5c
diff --git a/metadata/md5-cache/media-fonts/source-pro-20170111 b/metadata/md5-cache/media-fonts/source-pro-20170111
index ad4c72e9a9c8..b60363d560e8 100644
--- a/metadata/md5-cache/media-fonts/source-pro-20170111
+++ b/metadata/md5-cache/media-fonts/source-pro-20170111
@@ -1,8 +1,9 @@
 DEFINED_PHASES=install postinst postrm prepare setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Adobe's open source typeface family designed for UI environments
-EAPI=6
+EAPI=7
 HOMEPAGE=https://adobe-fonts.github.io/source-sans-pro/ https://adobe-fonts.github.io/source-serif-pro/ https://adobe-fonts.github.io/source-code-pro/
+INHERIT=font
 IUSE=cjk X
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=OFL-1.1
@@ -10,5 +11,5 @@ RDEPEND=media-libs/fontconfig cjk? ( media-fonts/source-han-sans )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/adobe-fonts/source-sans-pro/archive/2.020R-ro/1.075R-it.tar.gz -> source-sans-pro-20170111.tar.gz https://github.com/adobe-fonts/source-serif-pro/archive/2.000R.tar.gz -> source-serif-pro-20170111.tar.gz https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.tar.gz -> source-code-pro-20170111.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6860491d566aa138f98610579b9ca00a
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=78370064de319035b242347c431b9e2b
diff --git a/metadata/md5-cache/media-fonts/stix-fonts-1.1.1 b/metadata/md5-cache/media-fonts/stix-fonts-1.1.1
index 1db753f5d01a..d1b519b75919 100644
--- a/metadata/md5-cache/media-fonts/stix-fonts-1.1.1
+++ b/metadata/md5-cache/media-fonts/stix-fonts-1.1.1
@@ -1,13 +1,15 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Comprehensive OpenType font set of mathematical symbols and alphabets
-EAPI=5
-HOMEPAGE=http://www.stixfonts.org/
+EAPI=7
+HOMEPAGE=https://www.stixfonts.org/
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=OFL-1.1
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=mirror://sourceforge/stixfonts/STIXv1.1.1-word.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5a6580275a7b226c46f8c898cd38c0fd
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=fdbc45461d0fe59f18647bda8ba76933
diff --git a/metadata/md5-cache/media-fonts/stix-fonts-2.0.0 b/metadata/md5-cache/media-fonts/stix-fonts-2.0.0
deleted file mode 100644
index 2aa794d291e1..000000000000
--- a/metadata/md5-cache/media-fonts/stix-fonts-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Comprehensive OpenType font set of mathematical symbols and alphabets
-EAPI=6
-HOMEPAGE=http://www.stixfonts.org/
-IUSE=X
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=OFL-1.1
-RESTRICT=binchecks strip test
-SLOT=0
-SRC_URI=mirror://sourceforge/stixfonts/STIXv2.0.0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ada82c68e8be32d505c922e874ef9833
diff --git a/metadata/md5-cache/media-fonts/stix-fonts-2.11 b/metadata/md5-cache/media-fonts/stix-fonts-2.11
new file mode 100644
index 000000000000..dcbc7e4a9ae1
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/stix-fonts-2.11
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=Comprehensive OpenType font set of mathematical symbols and alphabets
+EAPI=7
+HOMEPAGE=https://www.stixfonts.org/
+INHERIT=font
+IUSE=X
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=OFL-1.1
+RESTRICT=binchecks strip test
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/stipub/stixfonts/v2.11/zipfiles/static_otf.zip -> stix-fonts-2.11-otf.zip https://raw.githubusercontent.com/stipub/stixfonts/v2.11/docs/FONTLOG.txt -> stix-fonts-2.11-FONTLOG.txt https://raw.githubusercontent.com/stipub/stixfonts/v2.11/docs/STIXTwoMath-Regular.pdf -> stix-fonts-2.11-STIXTwoMath-Regular.pdf https://raw.githubusercontent.com/stipub/stixfonts/v2.11/docs/STIXTwoText-Regular.pdf -> stix-fonts-2.11-STIXTwoText-Regular.pdf
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=9333b40ce575f9346cd433cd6cc8a8ed
diff --git a/metadata/md5-cache/media-fonts/termsyn-1.8.7 b/metadata/md5-cache/media-fonts/termsyn-1.8.7
index a22b7b7185a6..3519c8603459 100644
--- a/metadata/md5-cache/media-fonts/termsyn-1.8.7
+++ b/metadata/md5-cache/media-fonts/termsyn-1.8.7
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Monospaced font based on terminus and tamsyn
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/termsyn/
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/termsyn/files/termsyn-1.8.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f1b4faab8488b85489a766b0e53bc076
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=aafa40c979a349391617c2b9aae40bd0
diff --git a/metadata/md5-cache/media-fonts/thaifonts-scalable-0.7.2 b/metadata/md5-cache/media-fonts/thaifonts-scalable-0.7.2
new file mode 100644
index 000000000000..d534dc7f35db
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/thaifonts-scalable-0.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=Collection of free fonts for Thai
+EAPI=7
+HOMEPAGE=https://linux.thai.net/projects/thaifonts-scalable
+INHERIT=font
+IUSE=X
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2-with-font-exception GPL-3-with-font-exception )
+SLOT=0
+SRC_URI=https://github.com/tlwg/fonts-tlwg/releases/download/v0.7.2/ttf-tlwg-0.7.2.tar.xz -> thaifonts-scalable-0.7.2.tar.xz
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=34532a8762a84d56f4cf32d91c356f30
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 beb45e653b7d..b3bab0f3cf28 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,12 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A set of matching libre/open fonts funded by Canonical
-EAPI=6
-HOMEPAGE=http://font.ubuntu.com/
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=Set of matching libre/open fonts funded by Canonical
+EAPI=7
+HOMEPAGE=https://design.ubuntu.com/font/
+INHERIT=font
 IUSE=X
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=520d57793e185cef8740e5d0839f0171
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=738703ca2ae2bba8c656f3d6d8d2f9d6
diff --git a/metadata/md5-cache/media-fonts/umeplus-fonts-20180604 b/metadata/md5-cache/media-fonts/umeplus-fonts-20180604
new file mode 100644
index 000000000000..aee69af0cde3
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/umeplus-fonts-20180604
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=Modified Ume and M+ fonts for Japanese
+EAPI=7
+HOMEPAGE=http://linuxplayers.g1.xrea.com/modified_fonts_01.html
+INHERIT=font
+IUSE=X
+KEYWORDS=~amd64 ~x86 ~ppc-macos
+LICENSE=mplus-fonts public-domain
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://free.nchc.org.tw/osdn//users/21/21734/umeplus-fonts-20180604.tar.xz
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=03722f67686a92156da9e12c98a43383
diff --git a/metadata/md5-cache/media-fonts/unifont-10.0.06 b/metadata/md5-cache/media-fonts/unifont-10.0.06
deleted file mode 100644
index b0309a923346..000000000000
--- a/metadata/md5-cache/media-fonts/unifont-10.0.06
+++ /dev/null
@@ -1,13 +0,0 @@
-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/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font
-EAPI=6
-HOMEPAGE=http://unifoundry.com/
-IUSE=fontforge utils X
-KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(-)] )
-SLOT=0
-SRC_URI=mirror://gnu/unifont/unifont-10.0.06/unifont-10.0.06.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=773406be566d739b2ad99e7123a7afe6
diff --git a/metadata/md5-cache/media-fonts/urwvn-fonts-3.05 b/metadata/md5-cache/media-fonts/urwvn-fonts-3.05
index be66fe445909..f3445b3bf4b4 100644
--- a/metadata/md5-cache/media-fonts/urwvn-fonts-3.05
+++ b/metadata/md5-cache/media-fonts/urwvn-fonts-3.05
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 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
+DESCRIPTION=Vietnamese version of the standard PostScript fonts from URW++
+EAPI=7
+HOMEPAGE=http://vntex.sourceforge.net/
+INHERIT=font
 IUSE=X
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86
 LICENSE=GPL-2 Aladdin
 SLOT=0
 SRC_URI=mirror://sourceforge/project/vntex/urwvn-ttf/urwvn-3.05-ttf.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=56b8acd715f95ad072b06c17dc00ae50
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=ca6453aacf9bf11675b2646dd73f283e
diff --git a/metadata/md5-cache/media-fonts/viga-1 b/metadata/md5-cache/media-fonts/viga-1
index f35221cc7fc6..41fa7a31375f 100644
--- a/metadata/md5-cache/media-fonts/viga-1
+++ b/metadata/md5-cache/media-fonts/viga-1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A sans-serif font with great personality and good on-screen performance
-EAPI=5
+DESCRIPTION=Sans-serif font with great personality and good on-screen performance
+EAPI=7
 HOMEPAGE=https://www.fontsquirrel.com/fonts/viga
+INHERIT=font
 IUSE=X
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/viga-1.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9df11dbc7276bd1f35d02d3d9056f3d2
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=9c7c1826929cdf899601f548afc0cc1b
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 e87b6872834b..0a8dd96b3f95 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,13 +1,15 @@
+BDEPEND=dev-util/xdelta:3
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=dev-util/xdelta:3 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A droid derived Sans-Serif style CJK font
-EAPI=5
-HOMEPAGE=http://wqy.sourceforge.net/en/
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=Droid derived Sans-Serif style CJK font
+EAPI=7
+HOMEPAGE=http://wenq.org/wqy2/index.cgi https://sourceforge.net/projects/wqy/
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ca4996796d48834ee8bfaf358f38013d
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=9fb0365c26f6609ac55f2de58d5ae54b
diff --git a/metadata/md5-cache/media-fonts/wqy-unibit-1.1.0_p1-r1 b/metadata/md5-cache/media-fonts/wqy-unibit-1.1.0_p1-r1
index 9e6799124ede..df60e50a9444 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,13 +1,15 @@
+BDEPEND=media-gfx/ebdftopcf
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=media-gfx/ebdftopcf sys-apps/sed X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=WenQuanYi Unibit CJK font
-EAPI=5
-HOMEPAGE=http://wenq.org/enindex.cgi
+EAPI=7
+HOMEPAGE=http://wenq.org/wqy2/index.cgi https://sourceforge.net/projects/wqy/
+INHERIT=font
 IUSE=X
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/wqy/wqy-unibit-bdf-1.1.0-1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7d31f84bec4a2337be1d61f84fad7475
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
+_md5_=bdfb5f1b6393e6847c5337125f165418
diff --git a/metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46 b/metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46
index 36ccdf106ca1..8af22d906b95 100644
--- a/metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46
+++ b/metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
+DEFINED_PHASES=compile install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font
-EAPI=5
+EAPI=7
 HOMEPAGE=http://wenq.org/wqy2/index.cgi?ZenHei
+INHERIT=font readme.gentoo-r1
 IUSE=X
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
 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	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b2d0ecc9a39f8f7aac982e35698fcd65
+_eclasses_=font	dd073b36fe3fd8b868c23bc23209db45	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=38694ad5b8d0bf557e2f4006d042b1e1
diff --git a/metadata/md5-cache/media-libs/flac-1.3.3-r1 b/metadata/md5-cache/media-libs/flac-1.3.3-r1
index 88116c06f412..be1b5a429b6e 100644
--- a/metadata/md5-cache/media-libs/flac-1.3.3-r1
+++ b/metadata/md5-cache/media-libs/flac-1.3.3-r1
@@ -1,14 +1,15 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig !elibc_uclibc? ( sys-devel/gettext )
+BDEPEND=app-arch/xz-utils virtual/pkgconfig abi_x86_32? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install test
-DEPEND=ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( dev-lang/nasm )
+DEPEND=ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=free lossless audio encoder and decoder
 EAPI=7
 HOMEPAGE=https://xiph.org/flac/
+INHERIT=multilib-minimal
 IUSE=+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_sse static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1
 RDEPEND=ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=586addcd409d74876192d632fa5ae914
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=0975c1a6a7008c433755886afcf99d9b
diff --git a/metadata/md5-cache/media-libs/libdvbcsa-1.1.0-r1 b/metadata/md5-cache/media-libs/libdvbcsa-1.1.0-r1
new file mode 100644
index 000000000000..37062851f590
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libdvbcsa-1.1.0-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Free implementation of the DVB Common Scrambling Algorithm - DVB/CSA
+EAPI=7
+HOMEPAGE=https://www.videolan.org/developers/libdvbcsa.html
+IUSE=cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse2 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz
+_md5_=2e254fc5dfa1a2f3c194b425600861ee
diff --git a/metadata/md5-cache/net-dns/libidn-1.36 b/metadata/md5-cache/net-dns/libidn-1.36
index 1243a4fa5e93..0735c16f7ca4 100644
--- a/metadata/md5-cache/net-dns/libidn-1.36
+++ b/metadata/md5-cache/net-dns/libidn-1.36
@@ -1,14 +1,15 @@
-BDEPEND=>=app-portage/elt-patches-20170815
+BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) nls? ( >=sys-devel/gettext-0.17 ) >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) mono? ( >=dev-lang/mono-0.95 ) java? ( >=virtual/jdk-1.5 ) nls? ( >=sys-devel/gettext-0.17 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Internationalized Domain Names (IDN) implementation
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libidn/
+INHERIT=elisp-common java-pkg-opt-2 libtool mono-env multilib-minimal
 IUSE=doc emacs java mono nls elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) mono? ( >=dev-lang/mono-0.95 ) java? ( >=virtual/jre-1.5 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/12
 SRC_URI=mirror://gnu/libidn/libidn-1.36.tar.gz
-_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ed2f1a8303b792ec4e62e17201babfc6
+_eclasses_=elisp-common	d4b53ec63c580b993ed19445f411e1d2	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=ad91204e45229301bc76e10c91b715b1
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 425d8e4f3724..7efa7d024dbc 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -2720,7 +2720,7 @@ app-misc/wcd 5.2.7 5.3.4 6.0.1 6.0.2: Wherever Change Directory
 app-misc/when 1.1.37 1.1.40: Minimalistic personal calendar program
 app-misc/wipe 2.3.1: Secure file wiping utility based on Peter Gutman's patterns
 app-misc/worker 4.6.1-r100: Worker Filemanager: Amiga Directory Opus 4 clone
-app-misc/xmind 3.5.3.201506180105-r2 3.7.6_p201801311814: A brainstorming and mind mapping software tool
+app-misc/xmind 3.5.3.201506180105-r2 3.7.6_p201801311814: Brainstorming and mind mapping software tool
 app-misc/yq 2.9.2-r1 2.11.1 2.12.0: Command-line YAML processor - jq wrapper for YAML documents
 app-misc/ytree 2.02 2.03: A curses-based file manager
 app-misc/zisofs-tools 1.0.8: User utilities for zisofs
@@ -12676,38 +12676,38 @@ mate-extra/mate-system-monitor 1.24.0 1.24.1: The MATE System Monitor
 mate-extra/mate-user-guide 1.24.0-r1 1.24.0-r2: User documentation for MATE Desktop
 mate-extra/mate-user-share 1.24.0 1.24.0-r1: Personal file sharing for the MATE desktop
 mate-extra/mate-utils 1.24.0-r1 1.24.0-r2 1.24.0-r3: Utilities for the MATE desktop
-media-fonts/Humor-Sans 1.0-r1: A sanserif typeface in the style of xkcd
-media-fonts/ahem 1.0: A font developed to help test writers develop predictable tests
-media-fonts/alee-fonts 13-r1: A Lee's Hangul truetype fonts
-media-fonts/alegreya-sans 2.008: A humanist sans-serif typeface with a calligraphic, dynamic feeling
-media-fonts/alegreya-serif 2.007 2.008: Alegreya serif type family
+media-fonts/Humor-Sans 1.0-r1: Sans-serif typeface in the style of xkcd
+media-fonts/ahem 1.0: Font to help test writers develop predictable tests
+media-fonts/alee-fonts 13-r1: Lee's Hangul truetype fonts
+media-fonts/alegreya-sans 2.008: Humanist sans-serif typeface with a calligraphic, dynamic feeling
+media-fonts/alegreya-serif 2.008: Alegreya serif type family
 media-fonts/andika 5.000: Sans-serif font designed for literacy use
 media-fonts/anonymous-pro 1.002-r1: Monospaced truetype font designed with coding in mind
 media-fonts/aquafont 2.7-r4: Handwritten Japanese fixed-width TrueType font
 media-fonts/aquapfont 2.6-r2: Very pretty Japanese proportional truetype font
 media-fonts/arabeyes-fonts 2.0-r1: Arabeyes Arabic TrueType fonts
-media-fonts/arkpandora 2.04: Arkpandora MS-TTF replacement font pack
+media-fonts/arkpandora 2.04: Replacement fonts for Microsoft's Arial, Times, and Verdana fonts
 media-fonts/arphicfonts 0.2.20080216.1-r2: Chinese TrueType Arphic Fonts
 media-fonts/artwiz-aleczapka-en 1.3: Artwiz Aleczapko fonts
 media-fonts/artwiz-latin1 1.1: A set of improved Artwiz fonts with bold and full ISO-8859-1 support
 media-fonts/baekmuk-fonts 2.2-r2: Korean Baekmuk Font
 media-fonts/bitstream-cyberbit 2.0-r2: Cyberbit Unicode (including CJK) font
-media-fonts/cantarell 0.111 0.201 0.301: Default fontset for GNOME Shell
+media-fonts/cantarell 0.201 0.301: Default fontset for GNOME Shell
 media-fonts/cardo 1.04: Unicode font for classicists, medievalists and linguists
 media-fonts/cascadia-code 2102.25: A monospaced font developed for Windows Terminal
 media-fonts/cheapskatefonts 1.0: Dustismo's decorative font collection
 media-fonts/clearsans 1.00: OpenType font optimized for readability on small screens
 media-fonts/cm-unicode 0.7.0-r1: Computer Modern Unicode fonts
-media-fonts/comic-neue 2.2 2.3: Typographically savvy casual script typeface
+media-fonts/comic-neue 2.3: Typographically savvy casual script typeface
 media-fonts/corefonts 1-r7: Microsoft's TrueType core fonts
-media-fonts/courier-prime 1.203: A redesign of Courier
+media-fonts/courier-prime 1.203: Redesign of Courier
 media-fonts/cronyx-fonts 2.3.8: Cronyx Cyrillic bitmap fonts for X
 media-fonts/croscorefonts 1.31.0: Open licensed fonts metrically compatible with MS corefonts
 media-fonts/crosextrafonts-caladea 20130214: Open licensed serif font metrically compatible with Cambria
 media-fonts/crosextrafonts-carlito 20130920: Open licensed sans-serif font metrically compatible with Calibri
-media-fonts/culmus 0.120-r5 0.133: Hebrew Type1 fonts
+media-fonts/culmus 0.120-r5 0.133-r1: Hebrew Type1 fonts
 media-fonts/dejavu 2.37: DejaVu fonts, bitstream vera with ISO-8859-2 characters
-media-fonts/dina 2.93: A monospace bitmap font, primarily aimed at programmers
+media-fonts/dina 2.93: Monospace bitmap font, primarily aimed at programmers
 media-fonts/droid 113-r5: Font family from Google's Android project
 media-fonts/dzongkha-fonts 2009.09-r1: Bhutanese/Tibetan fonts for dzongkha script provided by the Bhutanese government
 media-fonts/eb-garamond 0.016: Claude Garamont's humanist typeface from the mid-16th century
@@ -12716,14 +12716,14 @@ media-fonts/ekushey-bangla-fonts 20070420: A collection of Free fonts for the Ba
 media-fonts/encodings 1.0.5-r1: X.Org font encodings
 media-fonts/essays1743 2.100: John Stracke's Essays 1743 font
 media-fonts/exljbris-free 20100320: Beautiful free fonts from exljbris Font Foundry
-media-fonts/exo 2: A geometric sans-serif font with a technological feel
+media-fonts/exo 2: Geometric sans-serif font with a technological feel
 media-fonts/fantasque-sans-mono 1.8.0: A font family with a great monospaced variant for programmers
 media-fonts/farsi-fonts 0.4: Farsi (Persian) Unicode fonts
 media-fonts/fgdc-emergency 2.20: FGDC Emergency Response Symbology Prototype
 media-fonts/fifth-leg 0.6-r1: Simplistic, technical sans serif - openSUSE font
 media-fonts/fira-code 4 5.2: Monospaced font with programming ligatures
 media-fonts/fira-mono 4.202: Default monospaced typeface for FirefoxOS, designed for legibility
-media-fonts/fira-sans 4.002 4.105 4.202: Default monospaced typeface for FirefoxOS, designed for legibility
+media-fonts/fira-sans 4.202: Default monospaced typeface for FirefoxOS, designed for legibility
 media-fonts/font-adobe-100dpi 1.0.3-r2: X.Org Adobe bitmap fonts
 media-fonts/font-adobe-75dpi 1.0.3-r2: X.Org Adobe bitmap fonts
 media-fonts/font-adobe-utopia-100dpi 1.0.4-r2: X.Org Adobe Utopia bitmap fonts
@@ -12768,12 +12768,12 @@ media-fonts/freefonts 0.10-r4: A Collection of Free Type1 Fonts
 media-fonts/fs-fonts 0.1_alpha3: Japanese TrueType fonts designed for screen and print
 media-fonts/gidole 2.0.2: Open source modern DIN fonts
 media-fonts/glass-tty-vt220 001.3-r2: Hacking with Style: TrueType VT220 Font
-media-fonts/hack 3.003: A typeface designed for source code
+media-fonts/hack 3.003: Typeface designed for source code
 media-fonts/hermit 1.21: Monospace font designed to be clear, pragmatic and very readable
-media-fonts/heuristica 1.0.2: A font based on Adobe Utopia
+media-fonts/heuristica 1.0.2: Font based on Adobe Utopia
 media-fonts/hunkyfonts 0.3.1: Free TrueType fonts based on Bitstream's Vera fonts with additional letters
-media-fonts/ibm-plex 2.0.0 5.1.3: The package of IBM's typeface
-media-fonts/inconsolata 20140821: A sans-serif monotype font for code listings
+media-fonts/ibm-plex 5.1.3: The package of IBM's typeface
+media-fonts/inconsolata 20140821: Sans-serif monotype font for code listings
 media-fonts/inconsolata-hellenic 1.19-r1: Hellenisation of the wonderful, monospace, open/free font Inconsolata
 media-fonts/inconsolata-lgc 1.3.0: Modified version of Inconsolata Hellenic adding the Cyrillic alphabet
 media-fonts/infinality-ultimate-meta 1: Meta package for infinality-ultimate with fonts
@@ -12781,7 +12781,7 @@ media-fonts/intlfonts 1.2.1-r1 1.4.1: International X11 fixed fonts
 media-fonts/iosevka 1.14.1: Slender typeface for code, from code
 media-fonts/ipaex 002.01: Japanese IPA extended TrueType fonts
 media-fonts/ipamonafont 1.0.8: Hacked version of IPA fonts, which is suitable for browsing 2ch
-media-fonts/ja-ipafonts 003.02-r1 003.03: TrueType fonts developed by Japanese Information-technology Promotion Agency
+media-fonts/ja-ipafonts 003.03: TrueType fonts developed by Japanese Information-technology Promotion Agency
 media-fonts/jetbrains-mono 2.225: A free and open-source typeface for developers
 media-fonts/jisx0213-fonts 20040425-r2: Japanese fixed fonts that cover JIS0213 charset
 media-fonts/jomolhari 0.003c: Bhutanese style dbu-can font for Tibetan/Dzongkha text named after Mt Jomolhari
@@ -12792,12 +12792,12 @@ media-fonts/kanjistrokeorders 4.002: Font for viewing stroke order diagrams for
 media-fonts/khmer 5.0-r1: Fonts for the Khmer language of Cambodia
 media-fonts/kochi-substitute 20030809-r3: Kochi Japanese TrueType fonts with Wadalab Fonts
 media-fonts/konfont 0.1: Fontset for KON2
-media-fonts/koruri 20161105: Japanese TrueType font based on M+ outline fonts and Open Sans
+media-fonts/koruri 20180915: Japanese TrueType font based on M+ outline fonts and Open Sans
 media-fonts/lfpfonts-fix 0.83-r2: Linux Font Project fixed-width fonts
 media-fonts/lfpfonts-var 0.84: Linux Font Project variable-width fonts
 media-fonts/liberation-fonts 2.1.2 2.1.3: A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat
 media-fonts/libertine 5.3.0.20120702-r3: Fonts from the Linux Libertine Open Fonts Project
-media-fonts/lklug 0.6-r1: Sinhala font
+media-fonts/lklug 0.6-r1: Unicode Sinhala font
 media-fonts/lohit-assamese 2.91.5: The Lohit Assamese font
 media-fonts/lohit-bengali 2.91.5: The Lohit Bengali font
 media-fonts/lohit-devanagari 2.95.4: The Lohit Devanagari font
@@ -12819,21 +12819,21 @@ media-fonts/mikachan-font-ttf 8.9-r2: Mikachan Japanese TrueType fonts
 media-fonts/mix-mplus-ipa 20130617-r1: Mixing mplus and IPA fonts
 media-fonts/monafont 2.90-r2: Japanese bitmap and TrueType fonts suitable for browsing 2ch
 media-fonts/monoid 0.61: Open source coding font
-media-fonts/montecarlo 0-r1: monospace font, created by programmers, for programmers
+media-fonts/montecarlo 0-r1: Monospace font, created by programmers, for programmers
 media-fonts/mplus-fonts 2.2.4-r1: M+ Japanese bitmap fonts
 media-fonts/mplus-outline-fonts 0_pre063 0_pre063_p1: M+ Japanese outline fonts
-media-fonts/nanum 3.0: The Nanum Korean fonts distributed by Naver
+media-fonts/nanum 3.0: Korean fonts distributed by Naver
 media-fonts/nanumfont 2.0-r2: Korean monospace font distributed by NHN
-media-fonts/noto 20190524 20200308 20200521 20201226: Google's font family that aims to support all the world's languages
+media-fonts/noto 20200521 20201226: Google's font family that aims to support all the world's languages
 media-fonts/noto-cjk 20190416: Google's CJK font family
 media-fonts/noto-emoji 20200317-r1 20200916 20201214: Google Noto Emoji fonts
-media-fonts/nunito 1.0-r1: A Sans Serif font with rounded terminals
-media-fonts/nuosu-sil 2.1.1: Unicode font for the standardized Yi script
+media-fonts/nunito 1.0-r1: Sans Serif font with rounded terminals
+media-fonts/nuosu-sil 2.200: Unicode font for the standardized Yi script
 media-fonts/office-code-pro 1.004: Customized version of Source Code Pro
-media-fonts/ohsnap 1.8.0: The ohsnap / osnap monospace font (based on Artwiz Snap)
+media-fonts/ohsnap 1.8.0: Monospace font based on Artwiz Snap with bold and versions with status icons
 media-fonts/oldstandard 2.2: Old Standard - font with wide range of Latin, Greek and Cyrillic characters
-media-fonts/open-sans 1 1-r1: Clean and modern sans-serif typeface designed for legibility across interfaces
-media-fonts/opendesktop-fonts 1.4.2 1.4.2-r1: Chinese TrueType Fonts
+media-fonts/open-sans 1-r1: Clean and modern sans-serif typeface designed for legibility across interfaces
+media-fonts/opendesktop-fonts 1.4.2-r1: Chinese TrueType Fonts
 media-fonts/oto 0.5: Open Type Organizer
 media-fonts/oxygen-fonts 5.4.3-r1: Desktop/GUI font family for integrated use with the KDE Plasma desktop
 media-fonts/paratype 2.5: ParaType font collection for languages of Russia
@@ -12846,48 +12846,48 @@ media-fonts/powerline-symbols 20170508: OpenType Unicode font with symbols for P
 media-fonts/proggy-fonts 1: A set of monospaced bitmap programming fonts
 media-fonts/qomolangma 2012.05: Tibetan Unicode Ucan and Umed fonts
 media-fonts/quivira 4.1: Unicode font with emoticons and elder scripts like Runes, Gothic, ancient Greek
-media-fonts/ricty 3.2.0-r2: A beautiful sans-serif monotype Japanese font designed for code listings
+media-fonts/ricty 3.2.0-r2: Beautiful sans-serif monotype Japanese font designed for code listings
 media-fonts/roboto 2.138: Standard font for Android 4.0 (Ice Cream Sandwich) and later
 media-fonts/sazanami 20040629: Sazanami Japanese TrueType fonts
 media-fonts/sgi-fonts 1.0: SGI fonts collection
 media-fonts/shinonome 0.9.11: Japanese bitmap fonts for X
-media-fonts/signika 1.001: A sans-serif with gentle character designed for signage
+media-fonts/signika 1.001: Sans-serif with gentle character designed for signage
 media-fonts/sil-abyssinica 1.500: SIL Opentype Unicode fonts for Ethiopic languages
-media-fonts/sil-arabicfonts 2.100: SIL Opentype Unicode fonts for Arabic Languages
+media-fonts/sil-arabicfonts 2.100 3.000: SIL Opentype Unicode fonts for Arabic Languages
 media-fonts/sil-charis 5.000-r1: Serif typeface for Roman and Cyrillic languages
-media-fonts/sil-doulos 5.000-r1: SIL Doulos - SIL font for Roman and Cyrillic Languages
+media-fonts/sil-doulos 5.000-r1: SIL font for Roman and Cyrillic Languages
 media-fonts/sil-ezra 2.51: SIL Ezra - Unicode Opentype fonts for Biblical Hebrew
 media-fonts/sil-galatia 2.1: The Galatia SIL Greek Unicode Fonts package
 media-fonts/sil-gentium 5.000-r1: Gentium Plus unicode font for Latin and Greek languages
-media-fonts/sil-padauk 2.8-r1: SIL fonts for Myanmar script
+media-fonts/sil-padauk 2.8-r1 4.000: SIL fonts for Myanmar script
 media-fonts/solarize 0_pre20140818 9999: Large Linux console font (suitable for word processing)
 media-fonts/sophia-nubian 1.0: Unicode sans-serif typeface for Coptic/Nubian languages
-media-fonts/source-han-sans 1.001 1.004: Pan-CJK OpenType/CFF font family
+media-fonts/source-han-sans 1.004: Pan-CJK OpenType/CFF font family
 media-fonts/source-pro 20170111: Adobe's open source typeface family designed for UI environments
-media-fonts/stix-fonts 1.1.1 2.0.0: Comprehensive OpenType font set of mathematical symbols and alphabets
+media-fonts/stix-fonts 1.1.1 2.11: Comprehensive OpenType font set of mathematical symbols and alphabets
 media-fonts/takao-fonts 003.02.01: A community developed derivatives of IPA Fonts
 media-fonts/tengwar-fonts 1.9d: Tengwar - the Elvish letters, created by Feanor and described by J.R.R.Tolkien)
 media-fonts/terminus-font 4.49: A clean fixed font for the console and X11
 media-fonts/termsyn 1.8.7: Monospaced font based on terminus and tamsyn
 media-fonts/tex-gyre 2.501: Extensive remake of freely available URW fonts
 media-fonts/texcm-ttf 1.0: TeX's Computer Modern Fonts for MathML
-media-fonts/thaifonts-scalable 0.6.1: A collection of Free fonts for Thai
+media-fonts/thaifonts-scalable 0.6.1 0.7.2: Collection of free fonts for Thai
 media-fonts/tibetan-machine-font 1.901: Fonts for the Tibetan and Himalayan languages
 media-fonts/ttf-bitstream-vera 1.10-r3: Bitstream Vera font family
-media-fonts/ubuntu-font-family 0.83-r1: A set of matching libre/open fonts funded by Canonical
-media-fonts/umeplus-fonts 20160402: UmePlus fonts are modified Ume and M+ fonts for Japanese
+media-fonts/ubuntu-font-family 0.83-r1: Set of matching libre/open fonts funded by Canonical
+media-fonts/umeplus-fonts 20160402 20180604: Modified Ume and M+ fonts for Japanese
 media-fonts/unfonts 1.0.2_pre080608-r1: Korean Un fonts collection
 media-fonts/unfonts-extra 1.0.2_pre080608-r1: Korean Un fonts extras collection
-media-fonts/unifont 10.0.06 13.0.01: GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font
+media-fonts/unifont 13.0.01: GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font
 media-fonts/urw-fonts 2.4.9: free good quality fonts gpl'd by URW++
-media-fonts/urwvn-fonts 3.05: fonts gpl'd by Han The Thanh, based on URW++ fonts with Vietnamese glyphs added
+media-fonts/urwvn-fonts 3.05: Vietnamese version of the standard PostScript fonts from URW++
 media-fonts/vdrsymbols-ttf 20100612: Font that contains symbols needed for VDR
-media-fonts/viga 1: A sans-serif font with great personality and good on-screen performance
+media-fonts/viga 1: Sans-serif font with great personality and good on-screen performance
 media-fonts/vlgothic 20141206: Japanese TrueType font from Vine Linux
 media-fonts/vollkorn 2.1: Vollkorn, the free and healthy typeface for bread and butter use
 media-fonts/webby-fonts 1: A small proportional bitmap font for use in webpages
 media-fonts/wqy-bitmapfont 1.0.0_rc1: WenQuanYi Bitmap Song CJK font
-media-fonts/wqy-microhei 0.2.0_beta-r1: A droid derived Sans-Serif style CJK font
+media-fonts/wqy-microhei 0.2.0_beta-r1: Droid derived Sans-Serif style CJK font
 media-fonts/wqy-unibit 1.1.0_p1-r1: WenQuanYi Unibit CJK font
 media-fonts/wqy-zenhei 0.9.46: WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font
 media-fonts/x11fonts-jmk 3.0-r3 3.0-r4: This package contains character-cell fonts for use with X
@@ -13267,7 +13267,7 @@ media-libs/libde265 1.0.8 9999: Open h.265 video codec implementation
 media-libs/libdiscid 0.6.2: Client library to create MusicBrainz enabled tagging applications
 media-libs/libdmtx 0.7.5: Barcode data matrix reading and writing library
 media-libs/libdv 1.0.0-r4: Software codec for dv-format video (camcorders etc)
-media-libs/libdvbcsa 1.1.0: Free implementation of the DVB Common Scrambling Algorithm - DVB/CSA
+media-libs/libdvbcsa 1.1.0 1.1.0-r1: Free implementation of the DVB Common Scrambling Algorithm - DVB/CSA
 media-libs/libdvbpsi 1.3.2 1.3.3: Library for MPEG TS/DVB PSI tables decoding and generation
 media-libs/libdvd-audio 1.0.0: library for extracting audio from DVD-Audio discs
 media-libs/libdvdcss 1.4.2-r1: A portable abstraction library for DVD decryption
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 19e4e350e986..a94d1a257f0e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Mar 2021 18:51:11 +0000
+Sun, 21 Mar 2021 19:21:10 +0000
author	Repository mirror & CI <repomirrorci@gentoo.org>	2021-03-21 19:21:11 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2021-03-21 19:21:11 +0000
commit	62e534b4c82a63dcf33b2f1525a75c49784b70cc (patch)
tree	310e2505196cb066ebc2f509868765f0b82ddc89 /metadata
parent	Merge updates from master (diff)
download	gentoo-62e534b4c82a63dcf33b2f1525a75c49784b70cc.tar.gz gentoo-62e534b4c82a63dcf33b2f1525a75c49784b70cc.tar.bz2 gentoo-62e534b4c82a63dcf33b2f1525a75c49784b70cc.zip