gentoo resync : 15.12.2019

33 files changed, 175 insertions, 148 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index e227f9c5278c..8bd9fb3d284d 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index 70faaf4483a2..6263af3135bf 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -21,6 +21,6 @@ DIST horev.tar.gz 19261 BLAKE2B 4a2c372f8ec0baac10190dda5ff462a32143240f90393dad
 DIST journal.tar.gz 27112 BLAKE2B 516255f54278c02492e17f7490540ff9c3d838fea673dfb69406ac3d49a75dd7eb83b283b497250b10ae6d948e4a869ee5a04afead6aa8e80e45ab939550614f SHA512 8ec18622b889fdddce3a0cc834a86bf55aa051acdb40114bd10b46f9b0e2b28222a781ec9bad135e784216c70d05ee5a0cdbc475029579bcbb5dcc99351b407d
 DIST ktav-yad.tar.gz 89373 BLAKE2B ada55f47b018d2cd624fd17ea9df472aead17ec331d09a3c73be7adf21ef9b160cc076c6eece43438383952237de44a0b83e176964dc37ffa928cd653e15d816 SHA512 c5b065cbcd2389ef3a81e408347be0dfabc130237f55567b4666b58533122b7c0622f09d17fe45c1fd73f0117afd411c10e6961398fe2de5764bbc53d5557cc8
 DIST ozrad.tar.gz 16709 BLAKE2B c8122ca1a9aa984fc0bd913e073150dcc4beb50e60fadbc532ec7c022d8efe9ef0b43299dda506794ea674946091c705ca775bf88bc5cb7a60de0aa5bf25d919 SHA512 78f5b686b6bd472966a2e682f057b03b05bf2450a6cfc147668c13f6857c655067b83f8549038ffea15429f067f2ee57520e3722e1ad818376e410468298f382
-EBUILD culmus-0.120-r5.ebuild 4625 BLAKE2B fcfa1992479df819b0cc50e85cbd0022f1eb2988c7ccf9d29fdc3169ac5e95aa9b0d75534054ed614bdd3c2e757f3b909c5218871d9b2654ee2f4b6a3cd0de57 SHA512 eca583c614ac13e4e5aee65d300947c6450a7022dc71677648133d2334fc6facfdc249e073715087ed9352a764ddf2cce78dc81e10ac62c6f68500008fe9de82
-EBUILD culmus-0.133.ebuild 4634 BLAKE2B 02d6e9a3aa6a9a8bb40e5a48fe743e138f8640133abf5af4c9cd25d0e4e6db55e7fdd31ace0c54b50b7bcde4e9dae523b2ab9c88942ed8a01b43c53c7b752f07 SHA512 83323e9fe6c54bec5ec5bef41bf01175f74a01f2979ea907e2345bfc78a33124d8dfe92ed48954f5094d00f9b8c8c548ec4a97421f0750d1cfa9ab16401b3f6a
+EBUILD culmus-0.120-r5.ebuild 4618 BLAKE2B 6acca97d1547bf853d39a88d4c22cfe2eaa70d187fbb94092c55706633889e469c00f68894c85897fd7077cf224c779d5b324941c3760abb700c016a1ea9f983 SHA512 2098ffc04f77c2abf0229abaf5d60b790b2965796a7f28ccff1e2ab9cef1fe4e9dac9bc7dd83851859cfb4c34a2bd448d34f0b2c69e1227132143c58d0c60c56
+EBUILD culmus-0.133.ebuild 4627 BLAKE2B fbba0f0f0fd3723f10858e622305d62b351a0cd535c7dadca7994a1e2c766aa44dceadc6e451e6e65fefd131d74ef135b985f6dae94fc711c7b4cd960b79084c SHA512 4ad6c945ad51e8e1e1246b1ce41980714da122b167885e5d643b0b066ecef6f6a89892b46561ba094539882b85e999186b836628e2699cca8a7787628c886393
 MISC metadata.xml 583 BLAKE2B 824a24c5f7812a73e49afa35f98ef8b31465dc797fae6048a057be7253d87d4d41da698550fc237fd2f1ce584e6d80d005361c98dd1964da9b9f6ddf222095ef SHA512 38b8e8dfc13787e2bfed9f0205e7a8ab7109634af52cf29acf8f1301eda8499725e8ee0df4dbc47474913901ea99446f16bcf82fced23a8961a70b60cc8beb01
diff --git a/media-fonts/culmus/culmus-0.120-r5.ebuild b/media-fonts/culmus/culmus-0.120-r5.ebuild
index eaa1f5351242..13ba5f1211b9 100644
--- a/media-fonts/culmus/culmus-0.120-r5.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r5.ebuild
@@ -156,7 +156,7 @@ src_install() {
 		done
 
 	pushd ${PN}$(use fontforge && echo -src)-${PV}
-	dodoc CHANGES || die
+	dodoc CHANGES
 	popd >/dev/null
 
 	if use ancient; then
diff --git a/media-fonts/culmus/culmus-0.133.ebuild b/media-fonts/culmus/culmus-0.133.ebuild
index cc33ae78e598..d21d6b87d735 100644
--- a/media-fonts/culmus/culmus-0.133.ebuild
+++ b/media-fonts/culmus/culmus-0.133.ebuild
@@ -156,7 +156,7 @@ src_install() {
 		done
 
 	pushd ${PN}$(use fontforge && echo -src)-${PV}
-	dodoc CHANGES || die
+	dodoc CHANGES
 	popd >/dev/null
 
 	if use ancient; then
diff --git a/media-fonts/dejavu/Manifest b/media-fonts/dejavu/Manifest
index acf8c9c27e86..34256430ca91 100644
--- a/media-fonts/dejavu/Manifest
+++ b/media-fonts/dejavu/Manifest
@@ -2,6 +2,6 @@ DIST dejavu-fonts-2.35.tar.bz2 11493699 BLAKE2B aa01f6d69b4150a123abf7615bd9a3bc
 DIST dejavu-fonts-2.37.tar.bz2 12050109 BLAKE2B f79504870b2b8748a23dfd58221ebe5b243d0fce98c08697ba179b2d11947af1418a8904179df54b3a7767c3480a11cb5ca7b75098444265769c51616474019d SHA512 e61fc8c675ef76edb49dd9a8caee62087280929bb8144b52aca2f8def30025c56246589ad8a6a806b9574e6876eedd16d57c70a6ce9c86817a2dfe39d8a2bb2b
 DIST dejavu-fonts-ttf-2.35.tar.bz2 5092541 BLAKE2B 49b7d4a4fb88bd4a6a98ec8e37e3b80c084171a8632b9632c9bcb41ee3f17f93114c9f35c513a769d901a70271380e4af209232a7719b081afd72c78028c4b49 SHA512 af0120e4c409cdcf31994499b2f24cb34e07961d5e48a70959ce6309df219e19bf35d0bb2a11f6ef5e24aa5788136998ec94fc2608bb6f409ba324595e858006
 DIST dejavu-fonts-ttf-2.37.tar.bz2 5429777 BLAKE2B d8614907887f20967fc7c75cb33b636a0eb5c682a076ccc7aef09f4ac243507afc005ef90d0b2aeee6a4a6a1ff3d5ce4fac0d1722a382525b3883ef53cdec26a SHA512 bafa39321021097432777f0825d700190c23f917d754a4504722cd8946716c22c083836294dab7f3ae7cf20af63c4d0944f3423bf4aa25dbca562d1f30e00654
-EBUILD dejavu-2.35.ebuild 2089 BLAKE2B a64f81357244f947b91594b992ca9c3a1fcbdc32bbef7d5635ac532bc198c0b4333e6c5a700804c08de91e99ad534f35039bd65b4689af3dc7b6a30bbb476dc4 SHA512 b899511d32c9ee50f016e523f6281c20226c5e691f0521ee6a123ea494767ef1b51995a316225e0dc9ce90ea5f18bc88055dae536150b45daa78ae68aa99f171
-EBUILD dejavu-2.37.ebuild 2154 BLAKE2B 18efce7416eedbcda391f395fd77d8e0157bfaa5b965a10f65472024ec62d980b12aa6d51521c26cb2819834aa50aab0dfdb49900dd08888a91640439ac21224 SHA512 d8ec32019dc19e53ce56258dde8bb1f79053a2bd4f46d6b3f350aac5393360629ed44ffc59836082284e3686ab4688562d633aeecb438e34dc7639d7cef4e1fb
+EBUILD dejavu-2.35.ebuild 2062 BLAKE2B 3486c761b108783c4cbaa4a53e0bf29456630cee54399bcb9dea4c4bc8358aef235face1357ddba8a4eb83262fa4e1c43d54886d7c30a1bf5bc4b84dbcbce15f SHA512 cb49d500b737be863c9bf2de454430c8579aeb9cb944b6a64b93f16587e2ef73c67b404a315f1391d5758156dc4ade81d92109404867d92d69b65d1d6b0f70ca
+EBUILD dejavu-2.37.ebuild 2127 BLAKE2B 27b53399b723a5902be3e641963f286612a6ae946c95a12a7622e09ff0705123364ae521566d6b07b8297f26751a10d5aed81bba0eea01a8acd1cc58bdfa42f5 SHA512 de53e21ea76466878ee9cabf2b7e9b3edc606b9b05727f949048218c30ddaaf11c85cf6c7b11470eaa0d93f79ba17557c599278fbf4c8361983e37aeedf0f8b3
 MISC metadata.xml 854 BLAKE2B 7d8d029b63f3abd43b29cfbe45a3008e4c94b8a2ec86726da3c129ac25ce4eeb56db8a7cb1018399bb5389fd15ab78231f6c438c73c4fcf364fc6c42fcdf7f86 SHA512 2baa05f3f861db77c828c4da9dd71067577a55e0566805d71ab553eec6c450609331477a614ce058b7bea4032b8eade7c1379f5db5a17cf7d00372620eb206ef
diff --git a/media-fonts/dejavu/dejavu-2.35.ebuild b/media-fonts/dejavu/dejavu-2.35.ebuild
index 0a0e131e0794..0f47efe4b70b 100644
--- a/media-fonts/dejavu/dejavu-2.35.ebuild
+++ b/media-fonts/dejavu/dejavu-2.35.ebuild
@@ -63,8 +63,7 @@ src_compile() {
 			BLOCKS=/usr/share/unicode-data/Blocks.txt \
 			UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \
 			FC-LANG=/usr/share/fc-lang \
-			full sans \
-			|| die "emake failed"
+			full sans
 	fi
 }
 
diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index f46826227e59..739c84999e4c 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -70,8 +70,7 @@ src_compile() {
 			BLOCKS=/usr/share/unicode-data/Blocks.txt \
 			UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \
 			FC-LANG=/usr/share/fc-lang \
-			full sans \
-			|| die "emake failed"
+			full sans
 	fi
 }
 
diff --git a/media-fonts/fira-code/Manifest b/media-fonts/fira-code/Manifest
index 7f4ae9e3ae17..743465148b31 100644
--- a/media-fonts/fira-code/Manifest
+++ b/media-fonts/fira-code/Manifest
@@ -1,10 +1,6 @@
 DIST FiraCode-Regular-Symbol.zip 9337 BLAKE2B b901cc37ad796f3a68d8b9e492aa35570c2d718fc84920b5b23c0a055e46c19916a7ec6b2c0a0adba650161c5a032761d46b303de64bddd81696adf960e3e541 SHA512 2570958b0f4b28ded52327150b67118d693d6bc6f483be3e3147ddda1c5870ab21f1b64938e4abc1030080455976c0d33ae3925b51660fd2c8b5428b5b0f8eb7
-DIST fira-code-1.205.tar.gz 5348822 BLAKE2B 9167765fb986a0b4552387fa43e71ddcfb97371692ad071659cc6a198dd4bee707e15a2f438daac1d5e038b8a4d2ddf4d5e0b94cf182655cd83b5085af3a207a SHA512 cbeb5fe4577ff6de5c4d58247c3b82b7aec4022afa5552394c660846d8caab8cca3a1a44aed8cccd10d03fe8c38e419d97663f5a750bd9d4e11ec4d2e5659bf8
-DIST fira-code-1.206.tar.gz 4679094 BLAKE2B 95a705979db3d96944986b78945734e87de0f7164db50313d9bcec5da3b2a8f6281bc1b1506c65a29358bc8fa65d9ffc2bb76b9e734077f6d487bc3bd63680e2 SHA512 022216fb3b7c553cd0608a51e8e5a2903375a15d3600a694dad68666897a5ed33d7ad6819db55e0ce4b7c58ac1dd3c33d2e05aded62ebf38365ffee8fb7f8ee0
 DIST fira-code-1.207.tar.gz 6640459 BLAKE2B ccd61201c5fe9d8755f0822d413df66184763f57b69965c22a6aceacda9ba117d4ffc0fbacb85e2c9202cd00de4b942ed36b599c3ecc46781fd3085b5a4ee688 SHA512 b0c555489f196c958a2abda4108fea10f13d2e62a94f26eebdc894e31ba5a34591e2a0214c4a8fb93fdb423b3e40c2e11045774a462c37faae24db1c85e4ce0e
 DIST fira-code-2.tar.gz 7100481 BLAKE2B 1ca41276c56b6edb174620224d2a0a72750cd29c48c71a350d033896e2ff6d59454236f193b6dc95f8f5ccd338951ac52f5c2e27c6a5286589382af938bc76f8 SHA512 313f11f1550d964119c2576bc988ca7d009ebd670c93b3c4a29583f91499166816ed326fdb5a5082ed7c7a33c49263e627a3356cc739aa1a8e34689820081399
-EBUILD fira-code-1.205.ebuild 618 BLAKE2B 88137715e4430f3807b1c9eb806cb51154235c634cbbc6498d32de302affb95d773de2b0639233ae1cf5cff9ed842a8d2ed3e6a749e46be0e8a5ff24d5151a58 SHA512 f0deec2a27ddbc65cf8dda234c7abbed40286f4dc0143b156cd20104b681b47eeba4b98f078283d3e283e6f7da1c7755e65d1e2f7adb7cf07557d5aa46c013e4
-EBUILD fira-code-1.206.ebuild 619 BLAKE2B d045a58476bf8af3f26150ea578b1e069818869b7a09f9261f12e2a75998bd01f5968312f105ae904af26d3a5476eebedee334f857e68f1428a64e0b6bf9580a SHA512 d3f4eddc634a578252e2d4ea086da45804d00c59589638806cf79317c86eb765a264346c864c109b130e52b42f73ad977322459aca277a7ca4bdec862f6c9bbd
 EBUILD fira-code-1.207.ebuild 615 BLAKE2B 94ffad9429749b3ade41f47cd598be8b0f6dd2edcc1e09e2961c9222794f0f68a93387aa053b595cd1e0706cb9387ec4bf084e8412a65c29c2529747fe507b6b SHA512 9da2f1fb6a322a36a425da7b79b19a10f7432a123b0c046151a0523d8c250102e29bffa67b006b81bb776696897a07f16e5ba2bd2dcecaccf44c4314a97726b5
-EBUILD fira-code-2.ebuild 619 BLAKE2B a10eab1225ebf883eb8fbef288134ebc055232d8d9b0ff783871fa070e38c291e2fc0e87942a03bb733507e9c43e65f7bfa016327693adbdb61e7b0678548975 SHA512 cfdecc5da09f445621f93fd598474453c1c9d14823153efd4e445b7d12e8af9b5e3756e524ebb5b98da94a3aed5a029721405b44f66dcde0fe98c91732d6f673
+EBUILD fira-code-2.ebuild 644 BLAKE2B 9a98629a65396348d1a4f8f0c9df5e5a4666a694cea5c3f76f86996d79f30f8a37cf5884935f0ed416f28d59ffd9df8fa091590b670db4fb9f3d95ced9070cc6 SHA512 93737cb5d94017703c498d027f0157901f5a789c04db6685417dc052cbddaa1596ba3b6f3151adf58f1b4de037207f6cd57dc1088964a6265409e5e2b329f874
 MISC metadata.xml 430 BLAKE2B 1d5b9b36382478e6ce2e7444cec9513f560e7c642cace9241ec36769b2ac17ba9282151ea321574dc53dfd26e2a98a289b9dd02bea1ea7a4641f8a75046213f2 SHA512 2378c23273f922c0088d9535e4ac94da0c05e59a79ef8119f351911bde62f7e3c8706a4276a888404ae8f18a3e5ad7181358db00c8a9c990a6874dc69f24eac8
diff --git a/media-fonts/fira-code/fira-code-1.205.ebuild b/media-fonts/fira-code/fira-code-1.205.ebuild
deleted file mode 100644
index 8271b9e75db0..000000000000
--- a/media-fonts/fira-code/fira-code-1.205.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-DESCRIPTION="Monospaced font with programming ligatures"
-HOMEPAGE="https://github.com/tonsky/FiraCode"
-SRC_URI="https://github.com/tonsky/FiraCode/archive/${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
-
-S="${WORKDIR}/FiraCode-${PV}"
-FONT_S="${S}/distr/otf"
-FONT_SUFFIX="otf"
-
-DOCS="README.md"
-
-src_prepare() {
-	default
-	mv "${WORKDIR}"/*.otf "${FONT_S}" || die
-}
diff --git a/media-fonts/fira-code/fira-code-1.206.ebuild b/media-fonts/fira-code/fira-code-1.206.ebuild
deleted file mode 100644
index 73d454e405d4..000000000000
--- a/media-fonts/fira-code/fira-code-1.206.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-DESCRIPTION="Monospaced font with programming ligatures"
-HOMEPAGE="https://github.com/tonsky/FiraCode"
-SRC_URI="https://github.com/tonsky/FiraCode/archive/${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/FiraCode-${PV}"
-FONT_S="${S}/distr/otf"
-FONT_SUFFIX="otf"
-
-DOCS="README.md"
-
-src_prepare() {
-	default
-	mv "${WORKDIR}"/*.otf "${FONT_S}" || die
-}
diff --git a/media-fonts/fira-code/fira-code-2.ebuild b/media-fonts/fira-code/fira-code-2.ebuild
index 7f97b424cbfe..27f63773a5e7 100644
--- a/media-fonts/fira-code/fira-code-2.ebuild
+++ b/media-fonts/fira-code/fira-code-2.ebuild
@@ -21,6 +21,8 @@ FONT_SUFFIX="otf"
 
 DOCS="README.md"
 
+DEPEND="app-arch/unzip"
+
 src_prepare() {
 	default
 	mv "${WORKDIR}"/*.otf "${FONT_S}" || die
diff --git a/media-fonts/glass-tty-vt220/Manifest b/media-fonts/glass-tty-vt220/Manifest
index 3941d3aa3189..33acd1d6faed 100644
--- a/media-fonts/glass-tty-vt220/Manifest
+++ b/media-fonts/glass-tty-vt220/Manifest
@@ -1,5 +1,5 @@
 DIST Glass_TTY_VT220-001.3.ttf 88228 BLAKE2B 0ea3b0f47f280f4b58f3a0ab844ec69c3870c9cf12d7f1cf1124ffbdcd451988aafcf9aa714d42610d3bba44c352b93791a7a2457f1ad3cd2e690a3f058cfb61 SHA512 0b3b598bbdcc8f1177b48a7cedd2ad035a8a95d17d162d868e7c988a9d918f2756a8fe674bef3f30357225a87ea4e3adde01889502540d6920210161edc37023
 DIST glass-tty-vt220-001.3.tar.gz 23707 BLAKE2B 3fe67a3e34d405aff20addaacd4a7acdd9fb4632cbc7f277a715469fab3ba68ef6985e17e8bcd630264641ecc56cc0f9a2e08876ac94ed26b40175cac1709738 SHA512 9ed77e9cff5c1c59a9a93cb2caaebdc19d8057827165630882cbacb5cc79e15c6b90044d3a5e85bfc55c344a16128d499f15d6bdff8ef3091093b2b7790fbedc
-EBUILD glass-tty-vt220-001.3-r2.ebuild 761 BLAKE2B b08470cba6e8ad65b2574431c8a2382448228bf0a5ef4bbaac3724737bc1da58261c3a9894eaf5f3ec3c2ecb68811ecac14902301c1843d53f668cdaedeeaade SHA512 527eae6385096ed8c36c9b267a90bb52a04baf939b641d0ec350e263b02830652f9c713d172d29b4d0fbe83a6520fc96eb090c31db1ded5850a1024a92bbbcc1
-EBUILD glass-tty-vt220-001.3.ebuild 567 BLAKE2B d3e5077a3705dffb21df135c38ab6aaf7fa0146b820ced341e6db9d45584f5346f7572a69da27a0137a99f8842a7aef55dc41c8cad220605fe596df50a18f1fa SHA512 e5aee8aad4b8149511f94bc2342bfa0141e4b360aae256164d940b687b433af86bf96b83e097dfdb4d3716c8d0c6f32c0dd1c87aa67706954d369038677b98e0
-MISC metadata.xml 1002 BLAKE2B 832819c66315b14cb9ee3d91bd96bc11ac17604ae51e3b95f5c7201bc1f32be2e7a25208a71b4228004cfeaea4d35a6da509df62f4046180a7a79fef11417063 SHA512 b2567aab7e2cd239b55446a516599a076d89fea9134b661a1533e60f0113c81eab67b1890e70d2971166f1eea4bf35a57406bb6f35cf564d53cd74d08600677f
+EBUILD glass-tty-vt220-001.3-r2.ebuild 760 BLAKE2B 2c024219a09e3a5fe29b8a4ace84964552a91ab5165de954fb8bc2e39c6f2b788310abf0de061decabb88388882126a2e4f5394d56a5cae8575c3c88aa89e9b2 SHA512 89113faaea56814edc81d66924008a7df8b290b45ff71c1f7d7144ff2a4da8822f22a54983c3d9672f53a5449802180d8cde647ef7308409ee45b000be022838
+EBUILD glass-tty-vt220-001.3.ebuild 568 BLAKE2B 2ef4c65ef8a1b8df1ca15cc0683fbf9974c6677cafe446609e49fa08ab627e13626feb65dd55e4933dbbf1b1e61bb2c6cd491d0755c8cbfa41cc261e23b7c670 SHA512 0be4ba90fe98d6fdb5f33f1b1fe9ecbe23b86555f32a2bc8c3c94fbc09143589ed2de14eed28431df20e6aa48c8dc0a62b18ef41649d0a50e138e1e4313709af
+MISC metadata.xml 883 BLAKE2B 2dd17a42c2bd1dc5ff6303b106675a72aacd0f93a41e3c784f1fa0fde749fa2dca4b02d53feed0d8bd17f8632d383de9f97a1bdafac376a8500d2447be297b01 SHA512 77e4c66e296c88a793843627743bf3cdeaa32e0453c5fc6304202aab080a50d79bd8b33341be05173e167a22ef358605ae33ecd35eb708085f2e131eee1d5e13
diff --git a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild
index 7a257a419b64..e9c6a1763e84 100644
--- a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild
+++ b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 "
 SRC_URI="https://github.com/svofski/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 LICENSE="Unlicense"
 SLOT="0"
 
diff --git a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
index 2cc36d005d84..32ca56359a3f 100644
--- a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
+++ b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://sensi.org/~svo/glasstty/"
 SRC_URI="http://sensi.org/~svo/glasstty/Glass_TTY_VT220.ttf -> Glass_TTY_VT220-${PV}.ttf"
 
 KEYWORDS="amd64 arm arm64 x86"
-LICENSE="freedist"
+LICENSE="Unlicense"
 SLOT="0"
 
 RESTRICT="mirror"
diff --git a/media-fonts/glass-tty-vt220/metadata.xml b/media-fonts/glass-tty-vt220/metadata.xml
index 029a9e3f3352..64f2c90ddaf3 100644
--- a/media-fonts/glass-tty-vt220/metadata.xml
+++ b/media-fonts/glass-tty-vt220/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		From author's description:
 		Spent some time looking around the net to find a font that mimics
diff --git a/media-fonts/ibm-plex/Manifest b/media-fonts/ibm-plex/Manifest
index 066a5679ec41..1aca76f86dfd 100644
--- a/media-fonts/ibm-plex/Manifest
+++ b/media-fonts/ibm-plex/Manifest
@@ -1,5 +1,9 @@
 DIST ibm-plex-2.0.0.tar.gz 77698418 BLAKE2B 01f058c285edf28618d2870b6021c3e77aef2719272d8c9a6e1eaa7f3863fb1dd9ac36b32e993e1591b25bd2a2c8bb4369b142d6cc81f866e756c8253f4d38ca SHA512 e76b8435606bf8f7dcaa330d2a861a60f3764886d04f88dceaf4a5a1dcda418df79fcbe9756541539181f35b853ee4ec9d43778338d1af1eb6e51a28cc514bb0
 DIST ibm-plex-3.0.0.tar.gz 76653068 BLAKE2B 5a33c8166f111eb7edd377d6034defe90ccd5a78803f1d53b1efd264eb087a64530de793db5f09c21072731003e8bf3b5739ef3547e9f29781ca88508c1338ab SHA512 cc00c610ead76f6ad6e90754f5feac5565dec81870882ae66a4e34654ec43abc0995ab05dfbd37c08c2cd5475a9d24eb8669cc5fcb8dc671b3ae714567fbcde9
+DIST ibm-plex-4.0.1.tar.gz 75874486 BLAKE2B bd2b874695ab1951ef54902e6969245925d8ae0d5ddfb9ec3680b2c05e2d0c10b28e363d0d60a008b9f0b9280a18c4bac96ed54112585058eeb31c3f31ac1498 SHA512 67671764600c72e342f38a8a817adc3d4e680c512faa554f144c1cc26e246e9aa92d5837c4d3850a8571f121b834ae0aad7f0f8404d03a3cf0416217644ab65b
+DIST ibm-plex-4.0.2.tar.gz 75546862 BLAKE2B aa1f0040a16d86dfee5c78c1a73ae26934a66f4d9d2dd168ee31d68eaa76b7ce0562de78996f871dde0b20570c434e8c79ccd9371c2629436bb146173a7af221 SHA512 0877fc13cf5aa31ab246f79a7b879726f3854e877afa51e9fe321cfe2e96cbc56bfb56f229e2a75c5192743351d4d645afdc256d22f89a27ce872248d0169d19
 EBUILD ibm-plex-2.0.0.ebuild 1416 BLAKE2B 10ab44bcf69b6c9a2e938b76b5f87454bc6109f3c7f1886b81bd07060fde899ddd2ca4d2113862b28a6075c5620e652ccd2b1ab0a80525fc4776d6cc4431347c SHA512 258ad5b3f04ede959d7d8876c9b78e0314fa6401838390dbdc72e8619029ed5496507fd7591ff71dca23c684ed0d0ff7e7643e3e7a8472d63a53a984e40a5b8b
-EBUILD ibm-plex-3.0.0.ebuild 1406 BLAKE2B 9795d0c853eb51d9e144bbd502a9ed7c233a51390dc81eb123659a45f07ca5fcb15bfc62ac20f6218cc23053745662ee1796e915907ac691d04eff4cf1d21c8d SHA512 5c1c8a1a359d5bbf50aaa45de208df947b4a7bb5ae0426682a94bd650a0a7126f72043bf41d6313321136f4688a83448396f42960b72e3b0dbf4661aababba13
+EBUILD ibm-plex-3.0.0.ebuild 1358 BLAKE2B 4e9fbe5a54387e5e5ec37293636d47673020b490a907a2057bad34d5bf1c0efa93aa367faf9ccdf18111f6bca5bda2b8e973fbd52251fd76126ac9f76a43a4bc SHA512 581d71920d658ac2e319d2c74a5045635b242b5a2f4d687d5447f67611a600a0376b14494cad90cf58e8456e53089b109da5097c78ba49aadd1242fcf34fc370
+EBUILD ibm-plex-4.0.1.ebuild 1307 BLAKE2B 96fa7afe8a8bc61c3a3120c4a092af17618586a63b6f489b9a38604cbdbe44e6d399b473bb81b4f2bf9dcf967610e727166054710a3f22d49d0a7860d8387df6 SHA512 439385db000b288ca559589c36e9bac08c304c9602fabd76c802c554a72f3217e7ad7a3f6f86912264960b712f4cfe8e987f05ee8b3957e60a11e3f6b97ac11b
+EBUILD ibm-plex-4.0.2.ebuild 1307 BLAKE2B 96fa7afe8a8bc61c3a3120c4a092af17618586a63b6f489b9a38604cbdbe44e6d399b473bb81b4f2bf9dcf967610e727166054710a3f22d49d0a7860d8387df6 SHA512 439385db000b288ca559589c36e9bac08c304c9602fabd76c802c554a72f3217e7ad7a3f6f86912264960b712f4cfe8e987f05ee8b3957e60a11e3f6b97ac11b
 MISC metadata.xml 350 BLAKE2B 7440f75b2e70848fdcaa34ba78a2b847b16e7202fa43e84b17b3c8abc6e0da2656e4d9e7488ff6f077ca5f245c8ff8582fb36b1169f8e258f3cead8bb02bdad0 SHA512 28b8cb595c5b0b4c5b56cafd8639a1ae59684b765309737bfc620110b376b73a4c86ec94ab9b4ff3161f7b8fdcc66b2c1a13874791d29c0ba024ad6b224b427a
diff --git a/media-fonts/ibm-plex/ibm-plex-3.0.0.ebuild b/media-fonts/ibm-plex/ibm-plex-3.0.0.ebuild
index 905da95c2d4e..1a24e6f7af76 100644
--- a/media-fonts/ibm-plex/ibm-plex-3.0.0.ebuild
+++ b/media-fonts/ibm-plex/ibm-plex-3.0.0.ebuild
@@ -29,7 +29,6 @@ if use otf; then
 	FONT_SUFFIX+="otf"
 
 	FONT_S="
-		"${S}"/IBM-Plex-Devanagari/fonts/complete/otf
 		"${S}"/IBM-Plex-Mono/fonts/complete/otf
 		"${S}"/IBM-Plex-Sans-Condensed/fonts/complete/otf
 		"${S}"/IBM-Plex-Sans-Devanagari/fonts/complete/otf
diff --git a/media-fonts/ibm-plex/ibm-plex-4.0.1.ebuild b/media-fonts/ibm-plex/ibm-plex-4.0.1.ebuild
new file mode 100644
index 000000000000..86983b1f16ca
--- /dev/null
+++ b/media-fonts/ibm-plex/ibm-plex-4.0.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="The package of IBM's typeface"
+HOMEPAGE="https://github.com/IBM/plex"
+SRC_URI="https://github.com/IBM/plex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="otf +ttf"
+
+REQUIRED_USE="^^ ( otf ttf )"
+
+S="${WORKDIR}/${P/ibm-}"
+
+DOCS=( README.md )
+
+FONT_SUFFIX=""
+
+src_install() {
+
+if use otf; then
+
+	FONT_SUFFIX+="otf"
+
+	FONT_S="
+		"${S}"/IBM-Plex-Mono/fonts/complete/otf
+		"${S}"/IBM-Plex-Sans-Condensed/fonts/complete/otf
+		"${S}"/IBM-Plex-Sans-Devanagari/fonts/complete/otf
+		"${S}"/IBM-Plex-Sans-Hebrew/fonts/complete/otf
+		"${S}"/IBM-Plex-Sans/fonts/complete/otf
+		"${S}"/IBM-Plex-Serif/fonts/complete/otf
+		"${S}"/IBM-Plex-Sans-Thai-Looped/fonts/complete/otf"
+fi
+
+if use ttf; then
+
+	FONT_SUFFIX+="ttf"
+
+	FONT_S="
+		"${S}"/IBM-Plex-Mono/fonts/complete/ttf
+		"${S}"/IBM-Plex-Sans-Condensed/fonts/complete/ttf
+		"${S}"/IBM-Plex-Sans-Devanagari/fonts/complete/ttf
+		"${S}"/IBM-Plex-Sans-Hebrew/fonts/complete/ttf
+		"${S}"/IBM-Plex-Sans/fonts/complete/ttf
+		"${S}"/IBM-Plex-Serif/fonts/complete/ttf
+		"${S}"/IBM-Plex-Sans-Thai-Looped/fonts/complete/ttf
+		"${S}"/IBM-Plex-Sans-Variable/fonts/complete/ttf"
+fi
+
+font_src_install
+
+}
diff --git a/media-fonts/ibm-plex/ibm-plex-4.0.2.ebuild b/media-fonts/ibm-plex/ibm-plex-4.0.2.ebuild
new file mode 100644
index 000000000000..86983b1f16ca
--- /dev/null
+++ b/media-fonts/ibm-plex/ibm-plex-4.0.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="The package of IBM's typeface"
+HOMEPAGE="https://github.com/IBM/plex"
+SRC_URI="https://github.com/IBM/plex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="otf +ttf"
+
+REQUIRED_USE="^^ ( otf ttf )"
+
+S="${WORKDIR}/${P/ibm-}"
+
+DOCS=( README.md )
+
+FONT_SUFFIX=""
+
+src_install() {
+
+if use otf; then
+
+	FONT_SUFFIX+="otf"
+
+	FONT_S="
+		"${S}"/IBM-Plex-Mono/fonts/complete/otf
+		"${S}"/IBM-Plex-Sans-Condensed/fonts/complete/otf
+		"${S}"/IBM-Plex-Sans-Devanagari/fonts/complete/otf
+		"${S}"/IBM-Plex-Sans-Hebrew/fonts/complete/otf
+		"${S}"/IBM-Plex-Sans/fonts/complete/otf
+		"${S}"/IBM-Plex-Serif/fonts/complete/otf
+		"${S}"/IBM-Plex-Sans-Thai-Looped/fonts/complete/otf"
+fi
+
+if use ttf; then
+
+	FONT_SUFFIX+="ttf"
+
+	FONT_S="
+		"${S}"/IBM-Plex-Mono/fonts/complete/ttf
+		"${S}"/IBM-Plex-Sans-Condensed/fonts/complete/ttf
+		"${S}"/IBM-Plex-Sans-Devanagari/fonts/complete/ttf
+		"${S}"/IBM-Plex-Sans-Hebrew/fonts/complete/ttf
+		"${S}"/IBM-Plex-Sans/fonts/complete/ttf
+		"${S}"/IBM-Plex-Serif/fonts/complete/ttf
+		"${S}"/IBM-Plex-Sans-Thai-Looped/fonts/complete/ttf
+		"${S}"/IBM-Plex-Sans-Variable/fonts/complete/ttf"
+fi
+
+font_src_install
+
+}
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index fa3991b2a283..4c833c4cec69 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -3,6 +3,6 @@ DIST liberation-fonts-2.00.1.tar.gz 4842687 BLAKE2B c38635a3bfdddbf5ef3f2ed2a1f7
 DIST liberation-fonts-2.00.5.tar.gz 4935865 BLAKE2B 059adc20217238a0783ea669d7e7b15673791e5f4d6769d091e4a6aabb8ced47e21c71ad19505f2215d4377d01ddae5c671304cb1ebb8430f60f44a5bd19ea5b SHA512 47e15ec1695a9576163f7378dc263d51c09956c73031f4a30abc7be10ccac9e0af69965c2f00b97509f6456e2e6ae09b49be17049cf2e54a27bdbd3b001a2a39
 DIST liberation-fonts-ttf-2.00.1.tar.gz 2285857 BLAKE2B 5eb3e10dbf1e5867bcbd443b5f68153448956fc73313e60a408fc69985229658951175753ccf694a79dcc91faafdec3edf113f300ee55f2246261f0dd3067054 SHA512 52dce5cf2c35165f81c903f2c7245d7f0e37a37eeb4003a015d8cc2404728f17ff4d723ddc5d4b6a6c03044d7ec97b98cf4eecfbc91607fcfed6e0aaff260739
 DIST liberation-fonts-ttf-2.00.5.tar.gz 2355722 BLAKE2B a782ab6668168b85cbfdba85df99a4ed4e6c173db7c47a2a2b0d67a1484bab70648b7b950fbb51448dd3cd31f68c3ea68a977966f0cf3cfd0aed903b8922c29b SHA512 fc00494842475d040c01029b6fb134fec9a37516a5e8e1b9ba945a2b38fe2ef3df6a0acfc00dc024cf2019f1106092d063c8322eece1be1cf8690db4ed8a653f
-EBUILD liberation-fonts-2.00.1-r3.ebuild 949 BLAKE2B 31e981baa4879a0838ce6e51113da376a55f2a84f932b42a7efb91eb3112dab0bdb2b93eb13573622a9937d1b3d2d6bba357763c7dd06ad787a75ad4ddbfc1b6 SHA512 7dfae220ca92c82e73a6f441bf994f3b5a493028d258539a51e8329022835dcb83f4ca05ff80d1593bb810ee0ccd6360c12f0eafaa1e7f0ded5925cc6a5ceb29
-EBUILD liberation-fonts-2.00.5.ebuild 950 BLAKE2B e86025d3d2287a1520800ea92d7f2a373c6191f1a86d322df939d3e07dace08418137e05692baef19dd21a4249d502d76d6c669123fe7978159ea60453f0c079 SHA512 df9341272fe404930d9e4106d3952a77a315cd068b2b421d8bb0b0f9cc0df72e6938b54b206ee852f1684d3528b054ddd4d66c09422bfe17c9068fb6181d476e
+EBUILD liberation-fonts-2.00.1-r3.ebuild 1181 BLAKE2B 8c9923ae81c6835825704b1b25da89c30c4e5cd063d992acaaf8d66460d5a7aea7c687f023d3e7b823b768ab83fbdd048ebe7fc32ed02a755b24dfa40ecb5dba SHA512 c5e38bb39d641534261600dabed5f8be58b16a17913e600c66490f6db3c2c61f7a9b7f58876d202c835938420a5bc7b826edeac26324d906c94366e4dcde3847
+EBUILD liberation-fonts-2.00.5.ebuild 1265 BLAKE2B 3b18657ab6d1175c65a782262e24f5bac437dfdac02db53eb6506f63f7b2458a957c60bc46d2ac5eb495539d1c017779db0e6c2efee27a4c8de2bd231298ced6 SHA512 fe3fd8c0fdac0910ec0a1d8edaf28b94d01aad2f67ef970a366f813fb94b871d41773f0d58260cc22760d127792470b4708bc9e838ea6a1ed5bbcd74d3cd6188
 MISC metadata.xml 481 BLAKE2B fb490d1a105e25ddde3d2cab04533d563cfbbd59e1c4ab14043ff6d383954f69bcd6b06318407f11e892f0d69c9707998e31ebd0a03aac82aca923664073a0d6 SHA512 6cb38a8d01724aae1f550fac02e128b0da8644de5bef5784bf0c69e59df6cf535867956115d0ee1a626c5e1e39eb207360a9f53883f04a22378272a84219bcc7
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild
index 78a09b75e220..f8b2526afc60 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,10 +25,21 @@ DEPEND="
 	fontforge? (
 		${PYTHON_DEPS}
 		media-gfx/fontforge
-		dev-python/fonttools
+		$(python_gen_any_dep '<dev-python/fonttools-4.0[${PYTHON_USEDEP}]')
 	)"
 RDEPEND=""
 
+python_check_deps() {
+	has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	if use fontforge ; then
+		sed -i "s/= python/= ${EPYTHON}/" Makefile || die
+	fi
+}
+
 pkg_setup() {
 	if use fontforge; then
 		FONT_S="${S}/${PN}-ttf-${PV}"
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
index 7cff094ba513..4f8f5081e5bc 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
@@ -9,8 +9,8 @@ inherit font python-any-r1
 
 DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
 HOMEPAGE="https://github.com/liberationfonts/liberation-fonts"
-SRC_URI="!fontforge? ( ${HOMEPAGE}/files/2926169/${PN}-ttf-${PV}.tar.gz )
-fontforge? ( ${HOMEPAGE}/files/2926167/${P}.tar.gz )"
+SRC_URI="!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/2926169/${PN}-ttf-${PV}.tar.gz )
+fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/2926167/${P}.tar.gz )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
 SLOT="0"
@@ -21,13 +21,24 @@ FONT_SUFFIX="ttf"
 
 FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
 
-DEPEND="
+BDEPEND="
 	fontforge? (
 		${PYTHON_DEPS}
 		media-gfx/fontforge
-		dev-python/fonttools
+		$(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
 	)"
 
+python_check_deps() {
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	if use fontforge ; then
+		sed -i "s/= python3/= ${EPYTHON}/" Makefile || die
+	fi
+}
+
 pkg_setup() {
 	if use fontforge; then
 		FONT_S="${S}/${PN}-ttf-${PV}"
diff --git a/media-fonts/noto-cjk/Manifest b/media-fonts/noto-cjk/Manifest
index dca066289fda..bb025c09ffe3 100644
--- a/media-fonts/noto-cjk/Manifest
+++ b/media-fonts/noto-cjk/Manifest
@@ -5,4 +5,4 @@ DIST noto-cjk-20190416.tar.gz 1882149745 BLAKE2B 0936414381624db8a601cb2af539286
 EBUILD noto-cjk-20150615.ebuild 756 BLAKE2B c1ee13c7340cf90d0dcd9130c3377332e9772828df9948cf8eb5d3df337c77e67bde57d53c2cdd1ad6129e1cceaec8e5e28179535036ef98c970c602ca95b411 SHA512 c8696b1655b25cfcb1004898d80d757e5cd2273fbe71e01cead68b379643259072917b03cd893de3213d9d76f8fab245255f030b48e5cb39b9d1eccdfe81cc14
 EBUILD noto-cjk-20170602.ebuild 644 BLAKE2B b996054820cc1fe2621968a4a4c91267823af08b4e3dd6a61953c336361d963172d701408c3ed391f942b30c472b8ffab4217e3a864fcc380087913fd99c5f0a SHA512 d4750ab9746e8c7be333f547d07973e2f31d415b6baffe32a8511aa176fd45cd62a5678d2b7bc57db9c3f6baa35aeeed07e29622f330c53b7676a13c90ecfda7
 EBUILD noto-cjk-20190416.ebuild 640 BLAKE2B 23fe26db84fcde0434d23b11750027bc31445b4bf67a4347d18ac677ddb313a9f7527098a4a70c71998433d3e46dd6f828d81dd8361c87082e8c34eb6e817319 SHA512 efa8f7ef5459d701bf4585c2ca779914353dc1db1e9e0d7fa2ad4f838859d54ee83e14a6d041ccd48bf8c012604eef861abd64d71b591ff37fde10ea3f402baa
-MISC metadata.xml 449 BLAKE2B f30d4df6c9ddc672a839eeb6433bd9583fa4af65c32190b09bca261e1a53e0c9bb396808811a3591c8b90337002fba8433d8eb816af4475f57339c299b8eaa06 SHA512 04d7f718df7e4d83823b778f09f1cb4e78ffceb154030dc1f8980cd9ca9cf8ed0140d0354b44e6523952e6ddae3e4879a467a1855092cfb7052ea97e099c98d4
+MISC metadata.xml 342 BLAKE2B b70890cc8753ce153715ae8ed4d1dc70c6abf23d96b99a915c211f2a044a59459bd228cbe6dd98202162723bcbc3b4bfa4608a26b793ff0670b1c9a85b521088 SHA512 81acab13745f9873e4dbe6371ce372b59ad3c4ac2c35a0cdd49dc25a639ea796180fa1d3b3e818c2a710b59921221b38a95dbde0576233636a9a560148b6673e
diff --git a/media-fonts/noto-cjk/metadata.xml b/media-fonts/noto-cjk/metadata.xml
index 4915e3a96577..f2387332549d 100644
--- a/media-fonts/noto-cjk/metadata.xml
+++ b/media-fonts/noto-cjk/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Fonts</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index f187edd0c3f2..38f496b18f0d 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -7,4 +7,4 @@ DIST noto-20190524.tar.gz 740252290 BLAKE2B e169ee60c9a83c13656ebd5dbce32aad183b
 EBUILD noto-20170403.ebuild 819 BLAKE2B 3bf921503660437c91da43ac3e7e9e05fff70ff95e9842b1c5d884d005a28286a929cc66772afa8f9c74d919045f9e45218ce8f2bfa0eb9539b1ceea26c8762e SHA512 728276eef93954d03eb649f2772d4cde19b3080e7bdff2da344d70026d992f5dd1d521f6786c50f32f38c1780988288463705fdd522cec298ba4c8d51bd6b8d7
 EBUILD noto-20181024.ebuild 928 BLAKE2B 394b9decc5153dad3d77a2ef0078ca4be32ecdd3c7048a80a5e4566994fa9cef0d5059f092649341014737c877cafbd0f791937ba2350ebf7440ecabc06d38df SHA512 eae13a5c8ed1e8cfc7dbc63cb1eb4ea6398f1c0cc4a25b3babe0f93c9dfb2f0d0a1a200519490e562a1b25f05f7c2273ebe42f4290feef7617421777fb173809
 EBUILD noto-20190524.ebuild 1273 BLAKE2B 0531ccd4ba287043bfdbf34f8652932809646c9ab8cc45f6bb5868111e9c88bada2efb649ecb3e1dcca124837f053964bd52070f677ea63728b01247333144a3 SHA512 6c3fdae251483364ca1cc1456d3c512b4b3360808c69e9a69a9ded7c8bba67bf6d5aae6c60bb18530aa5610491bce9a9109c1c72cfd5cade99716f7a0d669cdf
-MISC metadata.xml 523 BLAKE2B f44295f5bef7ef8248755f8dce32e6916bfcf3f4a6058c2cca7cf449cecfcd3b40ce134c01931190c2b9ca00349891d9ad3b2ba828d550d0344fb8b8c70960ce SHA512 3b876b78c73894a6c51b4026cb0fd9aeb816710ebaf85e297cc2dc627fd7cbfd934a75f6cc1e1bd75857171f1259a01ee71b0665928792f025047cc97cb63e5c
+MISC metadata.xml 416 BLAKE2B 28cd8161f664af29200d53d74d4d6c63c5d6921861750282317cf57c4654e66f72a69404f2ba2255739a325ec395da5d1483fe2b230ed3084431cd376ec94b38 SHA512 aa7174f866d3b68832c9915a2b14e3fd1731aca07a2aaf7b26d7b20f439c19f498ded395126a0ca50352694b5a2920cd370304fa45a7135704de8c4b9651e0eb
diff --git a/media-fonts/noto/metadata.xml b/media-fonts/noto/metadata.xml
index f6949c4dba8c..b6e0bb3244a6 100644
--- a/media-fonts/noto/metadata.xml
+++ b/media-fonts/noto/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Fonts</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
diff --git a/media-fonts/stix-fonts/Manifest b/media-fonts/stix-fonts/Manifest
index 1222f3d9e53b..e484bedbecc8 100644
--- a/media-fonts/stix-fonts/Manifest
+++ b/media-fonts/stix-fonts/Manifest
@@ -1,6 +1,6 @@
 AUX 61-stix.conf 1929 BLAKE2B c44515faed76fcb503fa0a51f0b9c7a1a805fad718afcf547212ce73a7c42d6e55cba7fd401756dda1b11cf9f9cc182244d58503ca3f8638e74e81e0cfa30008 SHA512 578b29a2703f393d002e343a4184952f32a20272af6cc925d21310ca5163a88c8a50cf04c5289ad55df29845b62efa6a9773c8310022e82901ec896d92688de1
 DIST STIXv1.1.1-word.zip 1834654 BLAKE2B ddd240876ae432a5796b70c7d4adc7f44446db7883b4bb3528b223d729a28cbff6f589e7f06323859397a4c9dcad34a1d5dcb9092977a8ae323b4adf1ee5ea64 SHA512 df5171f1a2de4e4e513013b47943cc8f7e210c59ddc11bb4d1f7d07680d7efdd0c73c96a349e523fbca24782314ded81a4eeb1b87aeb2a2c81d00fa9dbcd4b11
 DIST STIXv2.0.0.zip 3921396 BLAKE2B 3188b28e6f21df0bd3283cacac071399afb325cad3c36387e47448ee9bffcd452b59e4381663d06fbbb93d704a3510c23c31a88e832e75fbd7be85a179761553 SHA512 b5d1a98be67fb548d8898cee207b429a6b53617c0ee33b798273e4626e287af9404acf85e702c7fc6cd0b27da379a03013f77caeb57b957d7633efa722f69ae0
-EBUILD stix-fonts-1.1.1.ebuild 793 BLAKE2B 41c4abd49f39e36dfdc00283c06f902f0ee2df30f63643a567726b038686cb118f6a079d0a76a2d69fa1628eb0ddaea350606bdfe4142bf7bea75d60efa0257b SHA512 6923f3fd6824cd16f9fbdbfff99514b7d47480d3a32cce3f39a3bf9a68a984871e542d94e470c86e6818737cf92ad1e495e4f88bc8760a58eca4bce2fb13be6e
+EBUILD stix-fonts-1.1.1.ebuild 789 BLAKE2B 96b3987bceeb63ebb2403bce9b51369b30c17db207668aa40e3677d247d3fb65b50b9ce778a91f408aa3b6230055c5ea139a2908dfab72bd27cfdcab87ebe669 SHA512 1ca9bca012de4b9e1f12e999a965472bea20054f8418b072d8ac9107ba07b43215bd36c7afa18ba9d8ac5a1836b0456b55db7667c6cef798b61dd34d47c204be
 EBUILD stix-fonts-2.0.0.ebuild 708 BLAKE2B ef726c6fa2823c9ced48129d3a741087ea18904dfc8f6f73fb98a9cd8590b86ac818c506be2da353d24ad721b015f60043a239b2c7a396abf1b6db516d9a6776 SHA512 520e8f1e73fba6afdd95d1ec17960401d3651a0f9a855d2b5d7c4ae8439e0980ee26576cfb07d4337ab7ce1fb4cfa6796fa5921fd89274a4718b727ccab4ff8c
 MISC metadata.xml 317 BLAKE2B 503285934782ce57ede0881674e286d015803dd09480ada7e3fffc9fffe82160bde205b2141f448f814c06fcb16066b32624d74c2c4f0a694c31bb6472d4c5ae SHA512 7e384d1a8a6b0cb9cba64e52c57cb6d762218f1032f0680c2e35efd00d1e4c92444fc1ab8e7782d6a85b1cbc7835faada3d2e89c9692383f54035bf7676e2af9
diff --git a/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild b/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
index 3a85eae194c9..2510c026c408 100644
--- a/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
+++ b/media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN/-/}/STIXv${PV}-word.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/vc-fonts/Manifest b/media-fonts/vc-fonts/Manifest
deleted file mode 100644
index 254c48011291..000000000000
--- a/media-fonts/vc-fonts/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST bleed3.bdf.gz 3351 BLAKE2B 6e308fae7f892d839856f440630fd925ccd798d633155230a5dc1e4f9d09c79bf653b9641765c3dd1fc9bf23e082b7e1dea46a01fb788537c4878f26cc92c176 SHA512 3efc415d4220640ac84c5b32da6094aee2d693e96a0d679d2b01f6e1d3543e21b5cc4e5494cdb552138aae6d83d12133b2e0d7d0f144dc516491f31a62c15e6c
-DIST vc-fonts-20020207.tar.bz2 18154 BLAKE2B 46e47d0a85a8d7bd229850de16c80479ddf612efc35255f8a068792f774b48c7ce4bed992a40ca41fe0db879bfbba95609c50a958f7f147925414320c65ac174 SHA512 f65bf2edbeeae8af244ab255685076cc09729a31a10653032df59fc9751416082fdd2817c6d0077954bedb7d1554ac633a1abc01f5808285c259700dca18d310
-EBUILD vc-fonts-20020207-r2.ebuild 628 BLAKE2B bb2c2ee4418760e0ad65e8994d2508f7b69d4c02a8e525a9d91aa84af9fcc01b28894733c56f613e7bfb8c45b8a0018b073bef0da15977493fcdd1b5cf017211 SHA512 6c91979407f464a7e62e62919a83a89dc16501d2d7c561dbfebecec197a077fce93334902cc1bc81b62529f0ea5239426f102510471cb5141992f601cb85b023
-MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/vc-fonts/metadata.xml b/media-fonts/vc-fonts/metadata.xml
deleted file mode 100644
index 13ee79314597..000000000000
--- a/media-fonts/vc-fonts/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>fonts@gentoo.org</email>
-	<name>Fonts</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild b/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild
deleted file mode 100644
index 8f608d887731..000000000000
--- a/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font font-ebdftopcf
-
-DESCRIPTION="Vico bitmap Fonts"
-HOMEPAGE="http://vico.kleinplanet.de/"
-SRC_URI="
-	http://vico.kleinplanet.de/files/${P}.tar.bz2
-	mirror://gentoo/bleed3.bdf.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/vc"
-
-FONT_PN="vc"
-FONT_S="${S}"
-FONT_SUFFIX="bdf pcf.gz"
-FONTDIR="/usr/share/fonts/${FONT_PN}"
-
-src_prepare() {
-	default
-
-	mv ../bleed3.bdf . || die
-	rm bleed2.pcf.gz || die
-}
diff --git a/media-fonts/wqy-unibit/Manifest b/media-fonts/wqy-unibit/Manifest
index 3f5ee8ca58a3..e3d0f379dbcf 100644
--- a/media-fonts/wqy-unibit/Manifest
+++ b/media-fonts/wqy-unibit/Manifest
@@ -1,3 +1,3 @@
 DIST wqy-unibit-bdf-1.1.0-1.tar.gz 1168200 BLAKE2B 65d992525c1bac6f74983037a650729cb050322f150695af819d7ab8b57daec1a112ede8ff7054f9be5397a7fc823f65c89bd2f3eae624386a9c41bfb9a0594b SHA512 c16a8aa57fb5c55902373306b62514b2ec3bb9c5cd8494d5ecdb46f0407fd9fa72806c71bce28a27a7e64716b78862e8c2a9051a5652077b59e24693b1a30a03
-EBUILD wqy-unibit-1.1.0_p1-r1.ebuild 707 BLAKE2B bac340e874e272ad623f669e1dd614a12cdf1b2e8d3d17216eb6635c5ff834094f7473d682086c85109791523a66808b635b95b50d1a572aff181dcb4522cfce SHA512 c276a2731e3528a967c8b203708775c1b69ee8879fd83259a65779572df5299d58fd81d50158f2c8f7a268d89641b5277c294a047d57dfda74801fa5b2081de8
+EBUILD wqy-unibit-1.1.0_p1-r1.ebuild 700 BLAKE2B 284f85126f135d9e759f7a70b58447c8bc0bcd2a9d523af523a1a0452cc25cfaad7ff1c08fba557fa696b3c183d0f5e989715f9309830210bfc308b3d20a8cd9 SHA512 de82738828a64cc2fbaf298de618f7732c5bde060ac42806bda435615aa6cb9825b288f3612f282a615f0252c3266838cb37799b72ec4a8de6498e0839dd3e9e
 MISC metadata.xml 406 BLAKE2B da1b9d0858f2b8e72fd613faeee0c6e99c9f94d657fa54b910f5a90d146142208b582cf3b36cf09df9265a8c8880a6e1a2198540eb1cc2b4247a8d188c6ac9f4 SHA512 c3684a8c9b57db6be381f41d86af7f97ba57b480ecb048fc01aa948cad01db6fb0b2f64ca53258595f9c115e4b804d7aadbf57254ea85359cf36b9688c9c3869
diff --git a/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild b/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild
index 1fa0abb9ab19..f99e97246832 100644
--- a/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild
+++ b/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild
@@ -32,6 +32,6 @@ src_prepare() {
 }
 
 src_compile() {
-	emake || die
+	emake
 	gzip -9 wqy-unibit.pcf || die
 }