gentoo resync : 15.01.2020

32 files changed, 57 insertions, 135 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 8bd9fb3d284d..0b953bacaae6 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 7443ed6a9a6d..915470cbf019 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,5 +1,3 @@
-DIST cantarell-fonts-0.101.tar.xz 263480 BLAKE2B 79652cf87088a8fe505895cad1f2474e0cb52e4be8a977ae06442a0e8ca6ba6a7f93c811b14e56fd5e61a17c97175b2374d180e435cbac00af8c10b272461802 SHA512 52dbd8358de7e20146e627ab0b1298efb97ee335e45d8e63bab7c3a7d05314d0bb94ac448e34af4c6f7212623185a9e03a30eb24acee4915142e40af0086bbfb
 DIST cantarell-fonts-0.111.tar.xz 326216 BLAKE2B dad338329670674cf3815b2045f8f9a739a9e08913189cec67577982e58df8328e0dc185439bffb6bda0529846b844d0b37a3c9615210f23d47616969f7874b2 SHA512 638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e
-EBUILD cantarell-0.101.ebuild 1245 BLAKE2B b569bdad8b7fe4022db0ab0250bcbfa62cd32226d509cff99273061635487b9fe2b168334de8fd5d1642cf81fe1687ff6c9c1b9698b558a7400a53435ae6c16a SHA512 92721ee7c85bad1e876bb6c4b91020acfe49226d20d4a4c6af329d5f21d62ae9ce1e22d8ba9b9e90d722c1d147b751d6d23349a6adb46c8711e2a446eabb062c
-EBUILD cantarell-0.111.ebuild 1270 BLAKE2B 343262d98986c11644c0ab999a4d565d90525e9f46992f9e5ea780cd44782d635341aca6e578494e7ef7e34d8aea614211a6659be4eec4cf575da265af450b9e SHA512 d44cc14f02242c9ae56188b0fbdaa07dadde631a699cac7c446a43e73bc39b9b834e307e781ba11ac0fc88219f862e2b6f02009b589932fca1c0532a6f07acf1
+EBUILD cantarell-0.111.ebuild 1269 BLAKE2B 009fdc60f267cdb55485d7012d89e8785bf1d811c35e13112c61c10b0d3ffef1dd08c43338820d123411b0c25cd5a55f4b21699f3c754ea5f2c0c0ab2ca011c6 SHA512 526f60e99bafc2ef5e07ce1053a2772d0fc4ef159e754445058179ec04f0b08ed00aa0934edfade10c16070117b2f75e9fc824ddf60b1f8f013230e8be533b3d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.101.ebuild b/media-fonts/cantarell/cantarell-0.101.ebuild
deleted file mode 100644
index 39f0ff55de62..000000000000
--- a/media-fonts/cantarell/cantarell-0.101.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="${PN}-fonts"
-
-inherit font gnome.org meson
-
-DESCRIPTION="Default fontset for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="media-libs/fontconfig"
-# appstream-glib provided .loc and .its files required by gettext msgfmt for translation of .metainfo.xml
-DEPEND="
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-# Font eclass settings
-FONT_CONF=("${S}/fontconfig/31-cantarell.conf")
-FONT_S="${S}/prebuilt"
-FONT_SUFFIX="otf"
-
-src_prepare() {
-	# Leave prebuilt font installation to font.eclass
-	sed -e "/subdir('prebuilt')/d" -i meson.build || die
-
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dfontsdir=${FONTDIR}
-		-Duseprebuilt=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	local DOCS=( NEWS README.md )
-	meson_src_install
-	font_src_install
-}
diff --git a/media-fonts/cantarell/cantarell-0.111.ebuild b/media-fonts/cantarell/cantarell-0.111.ebuild
index 39e8373a117b..3eaf6029d5a6 100644
--- a/media-fonts/cantarell/cantarell-0.111.ebuild
+++ b/media-fonts/cantarell/cantarell-0.111.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="media-libs/fontconfig"
diff --git a/media-fonts/cronyx-fonts/Manifest b/media-fonts/cronyx-fonts/Manifest
index 8cd65a40e630..af7730dcf6f8 100644
--- a/media-fonts/cronyx-fonts/Manifest
+++ b/media-fonts/cronyx-fonts/Manifest
@@ -1,4 +1,4 @@
 DIST xfonts-cronyx_2.3.8-6.diff.gz 14285 BLAKE2B 91021cb3033fb6acd96b2f8fd12f4c621f066aabe7226b90d8a6a8da98fbfbfcb765a8a4cc7397b764b7b4c1f196c6e8a8df8cae1b7ae8c8f8981920f9b8ce42 SHA512 15703eda0e612b2cc29b16a4668fbe3efbfc3ffcea9bfa25ee47c4b3a7e1f0f8f5637b0f3c9b1239ab192f7229d56a433b8ff1b4366131d8d4c722f4451a1288
 DIST xfonts-cronyx_2.3.8.orig.tar.gz 269169 BLAKE2B e867a78511b744ca1b4fd95581c820b8932f8c17b336cc467f894324817b223b94179fe9cd5de46fd85445044e20c78ff067b650495eb0ba6e4781b05484f0bc SHA512 ac6e0d18977fb36ee255c57114f333dc5962c5a3f30dea8a6dccadd3831baa0d1b940c9a2fc40c56c043c8cb276c7a1bc039b555a68dab05e00139884b6b4696
-EBUILD cronyx-fonts-2.3.8.ebuild 716 BLAKE2B af89e51e06b0a1442692d4ac4a0255e220c6b8567699beac078fb57cd6ecec5c3e799671d1d1e3e247f54f73190a50004f5aba9e19afe1d2a79f014d7f519daa SHA512 22270cb0be207c29bda4956b3ca73def9678834a7f844debe4ba892d7365125141ad2b9c43a97dd2236eb17ad09e1b404c52495dd9ce2bc833b2728548fb0f9e
+EBUILD cronyx-fonts-2.3.8.ebuild 711 BLAKE2B 31d04c8f7b274ebbe4f83e67f0866b1e190a022132ce9199b8abe32ad81b3ac6f5a5cbeebd6365c16d4d72ac89769ab0754d44caab84ba34d5b3da446cd84086 SHA512 d64b4e5755c995831ba4d1d46c57fb69aa50668704dafe60c0758bcb4baeef507d75c2d8991f146ea3161a8d5b1db688e5c813118208e6dd4065a0e9b17a3faf
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
index c07950ee68d1..4ccd74b4324d 100644
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 	mirror://debian/pool/main/x/xfonts-cronyx/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/x/xfonts-cronyx/${MY_P}-6.diff.gz"
 
-LICENSE="freedist"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 
diff --git a/media-fonts/dzongkha-fonts/Manifest b/media-fonts/dzongkha-fonts/Manifest
index b182a869428a..de219457ceab 100644
--- a/media-fonts/dzongkha-fonts/Manifest
+++ b/media-fonts/dzongkha-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST dzongkha-fonts-2009.09.zip 2043649 BLAKE2B 2ba4c52f5b6ae071875ac1588a78f827d9401d398565b5c0f7486377cba588c14ef26a66015aa3bafede2c0abb3c19b3f39ff8c0fdde373da7b307ed96f044c0 SHA512 0d8019121d60714616ad15d4ca0e8d8c3038a0a60972524640c01ac7834661e981b6efb58b0469287b11712cb29cab2e194652aec0e84e8cc88d1b7395e31b54
-EBUILD dzongkha-fonts-2009.09.ebuild 534 BLAKE2B 79b641a830a16727e54ae09387010237dddf5974934d1482943994db2d3a0b18b03deece6b4c418ca435efe3b7208197520ae76978c7366dc38889c39a53d932 SHA512 9df47511311f70e747b0b9effa799ccafe8a38aa14c5480f482415f5e58ea8e08ed86716ab682cdf0bea9ad9a29e016f14237524df545b06990d5267672283c3
+EBUILD dzongkha-fonts-2009.09-r1.ebuild 568 BLAKE2B aec55891afe36521d73a706395d92eabe5100811248afb0fec0a5a3caa9c39764ea212ccc6de1e45ce0bbfa0e4e30d9f484326ca9bf330f25ee7c289eeb957c4 SHA512 0cb0c2aa0fea8d8595d0df8d0024bafb9e9a1d11dcbcc94db74b011178e627357f96b280b96bb8b615806e9c036e8ef3b6e8ad4b18459fd645c58dba51d73edf
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/dzongkha-fonts/dzongkha-fonts-2009.09.ebuild b/media-fonts/dzongkha-fonts/dzongkha-fonts-2009.09-r1.ebuild
index cda90291f51b..1585b906ac12 100644
--- a/media-fonts/dzongkha-fonts/dzongkha-fonts-2009.09.ebuild
+++ b/media-fonts/dzongkha-fonts/dzongkha-fonts-2009.09-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,10 +8,11 @@ DESCRIPTION="Bhutanese/Tibetan fonts for dzongkha script provided by the Bhutane
 HOMEPAGE="http://www.dit.gov.bt/downloads"
 SRC_URI="http://www.dit.gov.bt/sites/default/files/dzongkhafonts.zip -> ${P}.zip"
 
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 x86"
 IUSE=""
+RESTRICT="mirror bindist"
 
 DEPEND="app-arch/unzip"
 
diff --git a/media-fonts/fifth-leg/Manifest b/media-fonts/fifth-leg/Manifest
index a6d966675bd1..98642445da81 100644
--- a/media-fonts/fifth-leg/Manifest
+++ b/media-fonts/fifth-leg/Manifest
@@ -1,3 +1,3 @@
 DIST opensuse-font-fifth-leg-0.6.tar.bz2 265609 BLAKE2B d121f9593f2ee744e91360fb8af50354d800ee3d460573f8493c87aa7b803d7e0c71988524315d606988e18610057740ea4cdb2f54882784dba135e1772f1b2b SHA512 7c2ee6aab8d5bc54d3a0d3a7d02ff5514cdc9e6672fcd28e827197061e5aa3f023b1d6cbe7077458f8cb3046a22e4aac085d4a56398d59845d004edde67622f9
-EBUILD fifth-leg-0.6-r1.ebuild 465 BLAKE2B ea92d5b6c3bae0f6c4faefc8c22cf40058a1c922c3cedda0c7583d2367bcef5e0568313e0c1c4321d3a76517d7754e8c505b030cc5fc91ad400c1003be2fc0d9 SHA512 22d675184ced00fbc3f0479376846478505ad9b3638723a5bc8e073649c5b8f87e5259f1424288aba91705fa88ce50a0b747a09f96470e84d038c8e684995204
+EBUILD fifth-leg-0.6-r1.ebuild 495 BLAKE2B 9b47beb92e119e0798adeef319a67db849fba21ef590ceb94d1eee613415a6c74a9f2cf57fc9f799eb26e3025ab6ce909038407f4f96478ce7baaca03dd2f18b SHA512 b70037258a075304b9d97ca9404712ebe4c9d182ab5dd7312f16ce14362b139e433105c5894af5e1af1cb9ca0b782428ce2f17e757b161a927f5b14cd848b7f6
 MISC metadata.xml 347 BLAKE2B fdb054d0aecd35e7b747abc6df85bcacbb0438cbab3afe50a061e8626a8d4ccb39234dc638de5a8bca821806b517b4b28144e64101969723756592833f17c023 SHA512 9f9b7d43ae5c20225725504b96935eef4e8d07da81c5372871eed49df09cdf26428950f554e249a19f0e663b2b03f1b40dd293ce2f1a693f784fce656b488c88
diff --git a/media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild b/media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild
index 3d7b659bcbaa..2458f54bb18b 100644
--- a/media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild
+++ b/media-fonts/fifth-leg/fifth-leg-0.6-r1.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-OPENSUSE_RELEASE="12.2"
-OBS_PACKAGE="${PN}-font"
-
-inherit font obs-download
+inherit font
 
+OPENSUSE_RELEASE="12.2"
 DESCRIPTION="Simplistic, technical sans serif - openSUSE font"
 HOMEPAGE="http://jimmac.musichall.cz/log/?p=439"
-SRC_URI="${OBS_URI}/opensuse-font-${P}.tar.bz2"
+SRC_URI="https://api.opensuse.org/public/source/openSUSE:${OPENSUSE_RELEASE}/fifth-leg-font/opensuse-font-${P}.tar.bz2"
 
 LICENSE="OFL"
 SLOT="0"
diff --git a/media-fonts/freefonts/Manifest b/media-fonts/freefonts/Manifest
index eb027bc78173..d2201c235786 100644
--- a/media-fonts/freefonts/Manifest
+++ b/media-fonts/freefonts/Manifest
@@ -1,3 +1,3 @@
 DIST freefonts-0.10.tar.gz 2422824 BLAKE2B 9ceec3e86786957a2949660528de128a40e5d02dc15d28068d8ac2d8b61633dd8d3060085e2c7b20ff029a0076f789137a28830bf90ca00e15f95ebce01d8015 SHA512 21b911cb574015b6474b125fe20be6670fe32fe40e6534e738f8d0b527d3b7a8000843206343187deb565970e04fa900eeb5eae43e14b19a7acbeacad6b057b5
-EBUILD freefonts-0.10-r3.ebuild 466 BLAKE2B 33e3077a5af7f1c4e1c1bd077555f072d2bb24b84b31575b1ebf5f4b32d5d6352af7fd5c66005684766667aaf0349db75cc844d2eb64f4d41b09c58bf7f6e8d0 SHA512 25200c13c0cc0dcdd60328f02ab63b0dc3490e8d842fec13c56055a41e1870c40805418d5a5cff30e9632d4c9471b0e741d9308bdb1df7a85428c94324a72439
+EBUILD freefonts-0.10-r4.ebuild 525 BLAKE2B e9e409536319c4a0c2a4ce71e376bd1b80e220cc0120d3c26b3ea9de15064c7e0ecc6aeff3e88e8ea7fa4be466ca716927be77f21d014baafa5933442d3f078d SHA512 5ac913b231afe87fa909efb16e33d96205581867221ecbc5bc7fa6d836258fb705d75ab613c6ab7c905b0adbeae4fa32901b01e20a00067db17744a8bbcc7663
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/freefonts/freefonts-0.10-r3.ebuild b/media-fonts/freefonts/freefonts-0.10-r4.ebuild
index 85a881a03574..73fbbf9c7cff 100644
--- a/media-fonts/freefonts/freefonts-0.10-r3.ebuild
+++ b/media-fonts/freefonts/freefonts-0.10-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,10 +9,11 @@ DESCRIPTION="A Collection of Free Type1 Fonts"
 HOMEPAGE="http://www.gimp.org"
 SRC_URI="mirror://gimp/fonts/${P}.tar.gz"
 
-LICENSE="freedist"
+LICENSE="freedist free-noncomm all-rights-reserved"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="X"
+RESTRICT="mirror bindist"
 
 S="${WORKDIR}/freefont"
 
diff --git a/media-fonts/glass-tty-vt220/Manifest b/media-fonts/glass-tty-vt220/Manifest
index 33acd1d6faed..ddbeeb41dab3 100644
--- a/media-fonts/glass-tty-vt220/Manifest
+++ b/media-fonts/glass-tty-vt220/Manifest
@@ -1,5 +1,3 @@
-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 760 BLAKE2B 2c024219a09e3a5fe29b8a4ace84964552a91ab5165de954fb8bc2e39c6f2b788310abf0de061decabb88388882126a2e4f5394d56a5cae8575c3c88aa89e9b2 SHA512 89113faaea56814edc81d66924008a7df8b290b45ff71c1f7d7144ff2a4da8822f22a54983c3d9672f53a5449802180d8cde647ef7308409ee45b000be022838
-EBUILD glass-tty-vt220-001.3.ebuild 568 BLAKE2B 2ef4c65ef8a1b8df1ca15cc0683fbf9974c6677cafe446609e49fa08ab627e13626feb65dd55e4933dbbf1b1e61bb2c6cd491d0755c8cbfa41cc261e23b7c670 SHA512 0be4ba90fe98d6fdb5f33f1b1fe9ecbe23b86555f32a2bc8c3c94fbc09143589ed2de14eed28431df20e6aa48c8dc0a62b18ef41649d0a50e138e1e4313709af
+EBUILD glass-tty-vt220-001.3-r2.ebuild 757 BLAKE2B 0d37ee066cdf36b95115a17b48ff852157f4e3fdd20ed340f32b7de28ff6d562dc6280b0ddbd0509079ccc5e18189f8cfa705a44ee4cf432110021be6cb5a11a SHA512 c3ff6bfc062a2f90245d719b152c065fa36417ab07e3dcd045923bf7b45018baca3d13b01f68c16c03b51512e621e3e50a899c9361bc3be680e865e9e33dbb7c
 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 e9c6a1763e84..bdf6db36c461 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
deleted file mode 100644
index 32ca56359a3f..000000000000
--- a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-DESCRIPTION="Hacking with Style: TrueType VT220 Font"
-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="Unlicense"
-SLOT="0"
-
-RESTRICT="mirror"
-
-S="${DISTDIR}"
-
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-
-src_unpack() {
-	return
-}
-
-pkg_postinst() {
-	einfo "When using the GlassTTY VT220 font, you must set the font size to 15."
-}
diff --git a/media-fonts/intlfonts/Manifest b/media-fonts/intlfonts/Manifest
index 189a4efc4762..543a42174399 100644
--- a/media-fonts/intlfonts/Manifest
+++ b/media-fonts/intlfonts/Manifest
@@ -1,3 +1,3 @@
 DIST intlfonts-1.2.1.tar.gz 24360787 BLAKE2B bf75f895832310719d470e49ca206a6b888720c44927ac967ad6dabc19288d4220afc70bf38358899229315e25b5c473786838a2207c41c48e35765cd3a4d621 SHA512 c11508335cf0f819e7907a6b16c305fbfbf1182dbdea939773482bda3c0f27d70ba427ca3d22c62f4190c24f35bb2bcde4e4fa185aff7f4964293263f7b4304e
-EBUILD intlfonts-1.2.1.ebuild 727 BLAKE2B 17abdd5311937482c9012336a386f5d5a67ee949f0c3af3811dc69077b8af25604ace6b7190536062d7707030c1f22238baab0e2653f95ad212beae358a55189 SHA512 816f7ede0acf38661cb13af55b57052103f042cfffae7da6cbeac97ea30324c13ae476e66ca35a46e30c2070aa9067c5593af3273d17881bce2b5a876f89c053
-MISC metadata.xml 310 BLAKE2B fa2fd301aaecf5199872cc505f1f3e1617fcdc9d5b2339a09fbf17a5c211a86aa36679c02f329b8a2ad6303d4273e637e053e45cc49cc5cf2d749e625065482c SHA512 d28b30457a33057122995d04f513281a3513ca0b30c5afa4d5bfcb222912d0eb870c5afcd12dc2426b2d10cb82a9254888d6b307a9defab5112c4bbb6e60f22d
+EBUILD intlfonts-1.2.1-r1.ebuild 894 BLAKE2B dde019f08df9c13af50c13ffacf59f0cf22b7c3ec7841520f2b9f99547738067ee8a7c5a339bb538ee4191b02a73e84b296f295b74f8331e3091a7dcd3cfe15b SHA512 e20d718662573c6d9c849f568a5721455e4c0c0acf356b597803880fedb68a926a245b4f0c06126558417a3d4633972f913c82f2fbbc9321fecb3e0920591047
+MISC metadata.xml 370 BLAKE2B 7783e99cf31647a374b109157e9df67f528f61cb89d4f7936172a7e001b10e0cfe45a96aead40b4618a987af0f68f44b6cc7ff2536eefdf8ab737ca072daf06c SHA512 c41b35cb543c1756b194ffbcf0c14935ab70b588dbdd4b51615901c5c7244eee2566771b6b070ec13451c0dda638f20303a12f3eab39c17c5dad6a548d7ca83e
diff --git a/media-fonts/intlfonts/intlfonts-1.2.1.ebuild b/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
index 2f64bafdef9d..350e486b4ae7 100644
--- a/media-fonts/intlfonts/intlfonts-1.2.1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
@@ -9,16 +9,22 @@ DESCRIPTION="International X11 fixed fonts"
 HOMEPAGE="https://www.gnu.org/directory/intlfonts.html"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
-LICENSE="freedist"
+LICENSE="public-domain HPND non-free? ( free-noncomm )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="bdf"
+IUSE="bdf non-free"
 
 DEPEND="x11-apps/bdftopcf
 	>=x11-apps/mkfontscale-1.2.0"
 
 DOCS=( ChangeLog NEWS README Emacs.ap )
 
+src_prepare() {
+	default
+	# Tibetan fonts have a non-commercial restriction
+	use non-free || rm Asian/tib*.bdf || die
+}
+
 src_configure() {
 	local myconf=(
 		--with-fontdir=/usr/share/fonts/${PN}
diff --git a/media-fonts/intlfonts/metadata.xml b/media-fonts/intlfonts/metadata.xml
index 7d1842f83aff..8fa31783a57d 100644
--- a/media-fonts/intlfonts/metadata.xml
+++ b/media-fonts/intlfonts/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Fonts</name>
 </maintainer>
 <use>
-	<flag name="bdf">Installs BDF fonts in addition to PCF</flag>
+	<flag name="bdf">Install BDF fonts in addition to PCF</flag>
+	<flag name="non-free">Install non-free Tibetan fonts</flag>
 </use>
 </pkgmetadata>
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index 4c833c4cec69..4e4f5a6fdde1 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -4,5 +4,5 @@ DIST liberation-fonts-2.00.5.tar.gz 4935865 BLAKE2B 059adc20217238a0783ea669d7e7
 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 1181 BLAKE2B 8c9923ae81c6835825704b1b25da89c30c4e5cd063d992acaaf8d66460d5a7aea7c687f023d3e7b823b768ab83fbdd048ebe7fc32ed02a755b24dfa40ecb5dba SHA512 c5e38bb39d641534261600dabed5f8be58b16a17913e600c66490f6db3c2c61f7a9b7f58876d202c835938420a5bc7b826edeac26324d906c94366e4dcde3847
-EBUILD liberation-fonts-2.00.5.ebuild 1265 BLAKE2B 3b18657ab6d1175c65a782262e24f5bac437dfdac02db53eb6506f63f7b2458a957c60bc46d2ac5eb495539d1c017779db0e6c2efee27a4c8de2bd231298ced6 SHA512 fe3fd8c0fdac0910ec0a1d8edaf28b94d01aad2f67ef970a366f813fb94b871d41773f0d58260cc22760d127792470b4708bc9e838ea6a1ed5bbcd74d3cd6188
+EBUILD liberation-fonts-2.00.5.ebuild 1263 BLAKE2B 4c9fb2788134978fbffb89c5abf9640f802605ddbaae161ccb96cd3e39963d5282148a58edcecee51bf065e215c25b65692671b2abb89eb0bccc47086724a5df SHA512 1617f4abf9a798196a33a51e760732586a3b12f56af4ce2c229a50d0949929a09e3e86e7247ff98fca418339af5bb2d1788c845485e1998d649a43cd19f32f02
 MISC metadata.xml 481 BLAKE2B fb490d1a105e25ddde3d2cab04533d563cfbbd59e1c4ab14043ff6d383954f69bcd6b06318407f11e892f0d69c9707998e31ebd0a03aac82aca923664073a0d6 SHA512 6cb38a8d01724aae1f550fac02e128b0da8644de5bef5784bf0c69e59df6cf535867956115d0ee1a626c5e1e39eb207360a9f53883f04a22378272a84219bcc7
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 4f8f5081e5bc..464b2a00d2af 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.00.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit font python-any-r1
 
diff --git a/media-fonts/oxygen-fonts/Manifest b/media-fonts/oxygen-fonts/Manifest
index 55fc1f6e363b..6c387f0a431a 100644
--- a/media-fonts/oxygen-fonts/Manifest
+++ b/media-fonts/oxygen-fonts/Manifest
@@ -1,4 +1,4 @@
 AUX oxygen-fonts-5.4.3-fix-d-and-t-accents.patch 1720 BLAKE2B a6c6d8383db8470412cf2a9d3e60cffd1c808d5edc188b6bf991abc64e42bb963c4204fcbc8ee37f87ead26315d5e9073677bd657116bcfd7060f14d6ede13af SHA512 ef19f8e7d4a62a811402ac6604a338c030f6e7e7e74cf967040f22d2d6e49aa37cf0e2404bdd612e83ba29ecd73df4f91431fbc608fec0a125d19f80dbda807c
 DIST oxygen-fonts-5.4.3.tar.xz 161700 BLAKE2B f0232b46e35a2a66905907da772de3ab8dc60c823c400825d7198d860870f447f83bf8328d086d1a676b6f223bc99b4335249fca49d3d13a4b2f575831d060bd SHA512 6dab7b2ef3f7540cd28e91435662f6c43ef9e972fe4ccd1e58ba8904d1b4e8f1ca562384d02df1fc7c5dd5366e9be1ed0a1590a9b9a182621e4bab26ffc3497f
-EBUILD oxygen-fonts-5.4.3-r1.ebuild 803 BLAKE2B c81f2acab10601773f907d3d2b7941120b52ae54ce768230bfebca3c4fbd7fa63b23200a7f36ffbe9b18ecfcc71f4e4beb4705aefb6e83166f45b2c0e2dd3187 SHA512 1589053dc19b3c9ddca75ba1793627081770b1a1a0c37a8ccf0189c5a771ca0783cfc0248b260f10520b2aad6d84c70a642cd20feb3e9a61fa9a5a864262fa81
+EBUILD oxygen-fonts-5.4.3-r1.ebuild 785 BLAKE2B 73983e879585761f4d816ee40ee7a9cb630b4105481e107623f2ac90d34f6390a26a435a24497c1060572cbd4daa621ce1854de0a5bd10e340f2d84a7c6468ab SHA512 b90db1594c83b1ece1bebb38d2cee28b1dfafd2845081c6cd68aec64344ef306e5d57a7e61d269a297d3344dbe2bb4ef73a192d5d9094b7176aa888e8c217a55
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild b/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild
index 4e52cb0823ec..d5c2a8b92d06 100644
--- a/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild
+++ b/media-fonts/oxygen-fonts/oxygen-fonts-5.4.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils font kde.org xdg-utils
+inherit cmake font kde.org xdg-utils
 
 DESCRIPTION="Desktop/GUI font family for integrated use with the KDE Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/oxygen-fonts.git"
@@ -15,8 +15,8 @@ KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 BDEPEND="
-	>=kde-frameworks/extra-cmake-modules-5.60.0:5
 	>=dev-qt/qtcore-5.12.3:5
+	>=kde-frameworks/extra-cmake-modules-5.60.0:5
 	media-gfx/fontforge
 "
 
@@ -30,10 +30,10 @@ src_configure() {
 	local mycmakeargs=(
 		-DOXYGEN_FONT_INSTALL_DIR="${FONTDIR}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	font_src_install
 }
diff --git a/media-fonts/qomolangma/Manifest b/media-fonts/qomolangma/Manifest
index 8d0f1882c200..4d87987f55bd 100644
--- a/media-fonts/qomolangma/Manifest
+++ b/media-fonts/qomolangma/Manifest
@@ -1,3 +1,3 @@
 DIST qomolangma-2012.05.rar 1593416 BLAKE2B bb3c64fd1dbddffb0acc99e3cfccc023fa8948f8829df3689a340d98342b22c8b949be7fafda24db5b4568e9e62258980da49678f144167b30a40517bc62def6 SHA512 a280a8160c0ca7ff485919b3358ea19777b84ac6c2e269e8e97b24623551d261e8dfa7fd7805ed23edadb046ee7b9aad081b87071ffbab580f6ba961a8f38f9b
-EBUILD qomolangma-2012.05.ebuild 473 BLAKE2B d65d4e8439c2ce6fc684bf48f839ba952d0b36c5a3ca27e84a2037fe9d8b9b56f01827e26f21140b37f952608d054c7f482ae10bb74bdc4cffac5e06c3f9125b SHA512 0ae863db482dcf6b969d5cca3e2654195c0a0e5e9298c51e51895c508ba6dca0d4360fe55f5cd6f8fa8f95f196fe6886351b9160c5876e449f8b0969c72abb99
+EBUILD qomolangma-2012.05.ebuild 474 BLAKE2B d02f506429da990e78d11e2653b51466eb7a26989e0ebc6e69c758fafd2107d0a867c18f70eba7380dd98bed237a7f3aaf75bfc6c75ee378fa6af21ae50891f3 SHA512 34d849a84af48c7a2dbbd4a96cdda306b8c05315288eb53efb920328341d7d2c6171656f97ed0361052c65183a96be76970248dfcb3f2000449f4da11bfcc202
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/qomolangma/qomolangma-2012.05.ebuild b/media-fonts/qomolangma/qomolangma-2012.05.ebuild
index 1a9500ce9b27..c726a538fa58 100644
--- a/media-fonts/qomolangma/qomolangma-2012.05.ebuild
+++ b/media-fonts/qomolangma/qomolangma-2012.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ DESCRIPTION="Tibetan Unicode Ucan and Umed fonts"
 HOMEPAGE="http://www.yalasoo.com/English/docs/yalasoo_en_font.html"
 SRC_URI="http://www.yalasoo.com/files/CTRCfonts.rar -> ${P}.rar"
 
-LICENSE="freedist"
+LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 731e728ad8d6..b7f30445af55 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,7 +1,7 @@
 DIST terminus-font-4.46.tar.gz 590210 BLAKE2B 427b4878afd47cc6c1a0ba6b6116568630a618e313c24744b3465b3e301e142ccbb9bd5e336bed7d98f3d1e01a0a61c6fbdd17912f4d9332ed5430ef47bca4fe SHA512 ae221920ecff54b9575a25d30a429feee6e19ef1e9669896c34f86f80d5495c3654f5423ff1df76e86bc999d1f37c306048b44d8ca55144f0f299926d3d33b58
 DIST terminus-font-4.47.tar.gz 620344 BLAKE2B 10eaac6ff4880652ee7373374735629cada73e1cb63344b75b579532fad154b10322a7cb3691c2270c2b4d1aee0914c64338d3650625883752c7e33e5205212a SHA512 09455d107a09c422f4fedfcc70ae1483063c844fb01b0adfa3d2a0e28c9502e9ca922542b5ad735cbebb491d148c453d0213d61ebebf64c79f16cb582964fa47
 DIST terminus-font-4.48.tar.gz 620561 BLAKE2B 8ab977a0b4b529faa38d082969e10a8f0ca3860b745441ed8f45761b95869194226446c487bc7c5490d2a88d1836aa6152424d6646b63b9fbc11e43dc8e255d6 SHA512 5f45f7d0e7396f02158f4751aaafb3f0a3fb68dbe3e5501f86a5138c6d52f5106053e38c368d560e5979e29250074dbde5165702b8905a564d029663a2219af4
-EBUILD terminus-font-4.46.ebuild 2618 BLAKE2B f5d076ca5a211600af8e0199a0182d36849ae6b4e4182dc0b00c5813a2004de63e8725aa9a16b0332e252436a25784ae69ac5af78247820b53cbddf6c71f714b SHA512 a48b3b18a3f8706585340371cecea89b708d25f04317b5f3d137a8ce60dd09ef7ab6316931d77adfb9766df0627a01c6f99e0253869bbc8cfe6ab89dfad9f140
-EBUILD terminus-font-4.47.ebuild 2625 BLAKE2B c005d110b8c1520bdff588ac20ec96b12138e49b27f30596151265deb55e6c1f2eba5e5eacaae10b7532c5425a9bfc6854d36102a0b384e7c57fabd6c38f26ef SHA512 55585837ffdc1227f707fa555d0137ab870dc4bd78208d06ee7bd99a4fb33fe050a51fde137118a4e9a61722ff06136a42716fa8ead78a692a3d041a37a74342
-EBUILD terminus-font-4.48.ebuild 2625 BLAKE2B c005d110b8c1520bdff588ac20ec96b12138e49b27f30596151265deb55e6c1f2eba5e5eacaae10b7532c5425a9bfc6854d36102a0b384e7c57fabd6c38f26ef SHA512 55585837ffdc1227f707fa555d0137ab870dc4bd78208d06ee7bd99a4fb33fe050a51fde137118a4e9a61722ff06136a42716fa8ead78a692a3d041a37a74342
+EBUILD terminus-font-4.46.ebuild 2611 BLAKE2B 73a139661cfb16eb2b55e31c40b32e99853a7b8e6e2f86a795ad2c4870eb4d971a7dc93abe0ce3d1574033c1b90562fe5b08668ade270eb71fc9e23fd41bec6b SHA512 814114be497ca17d7e3af4b87bb8ff9eab6a5afdaf9a39be8f2188a440b5204a9f06d98632d349d4a25ec4a911dc8b6a9ffe6fec5e6dd22343bbdf328229f946
+EBUILD terminus-font-4.47.ebuild 2623 BLAKE2B f6f411bde1382da1741842da558ef23f89773c254945759af8055d5566fb1948aa8b3d3b31d49c87e32ca530377608f9f477d56c2789822614618710034f0477 SHA512 04374f1b1dfc761c377f79cdc85ddfc312c4ee9aa0bee9f3e18951353a0825edec3398fce4f5fe9773f4e8dd67127c909e6e455f1552e2b522918f7c76c87957
+EBUILD terminus-font-4.48.ebuild 2623 BLAKE2B f6f411bde1382da1741842da558ef23f89773c254945759af8055d5566fb1948aa8b3d3b31d49c87e32ca530377608f9f477d56c2789822614618710034f0477 SHA512 04374f1b1dfc761c377f79cdc85ddfc312c4ee9aa0bee9f3e18951353a0825edec3398fce4f5fe9773f4e8dd67127c909e6e455f1552e2b522918f7c76c87957
 MISC metadata.xml 1568 BLAKE2B 47b12c122ee6823023bbc4844474e5f2eaad16bfd5f0853ff192c60c007a3fc03353a64f26d824fd43ae96d5044bdaccbbc2fe75177080f76a9db69ff8f44b6a SHA512 6255452e74da62e7b081fdb8a3eb4069e4419503d7364cac2ff1c014858482b99713a33a18b1b8bc3bdc409a90b2d6e03421e07559f74f4c8f0ae132d9940d96
diff --git a/media-fonts/terminus-font/terminus-font-4.46.ebuild b/media-fonts/terminus-font/terminus-font-4.46.ebuild
index b3e178148461..f085937bb80e 100644
--- a/media-fonts/terminus-font/terminus-font-4.46.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.46.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit font python-any-r1
 
 DESCRIPTION="A clean fixed font for the console and X11"
diff --git a/media-fonts/terminus-font/terminus-font-4.47.ebuild b/media-fonts/terminus-font/terminus-font-4.47.ebuild
index d82100c3b33e..f37d2391b735 100644
--- a/media-fonts/terminus-font/terminus-font-4.47.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.47.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit font python-any-r1
 
 DESCRIPTION="A clean fixed font for the console and X11"
diff --git a/media-fonts/terminus-font/terminus-font-4.48.ebuild b/media-fonts/terminus-font/terminus-font-4.48.ebuild
index d82100c3b33e..f37d2391b735 100644
--- a/media-fonts/terminus-font/terminus-font-4.48.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.48.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit font python-any-r1
 
 DESCRIPTION="A clean fixed font for the console and X11"
diff --git a/media-fonts/tex-gyre/Manifest b/media-fonts/tex-gyre/Manifest
index 8319b5eb666c..2007a8721788 100644
--- a/media-fonts/tex-gyre/Manifest
+++ b/media-fonts/tex-gyre/Manifest
@@ -1,3 +1,3 @@
 DIST tg-2.005otf.zip 2284184 BLAKE2B bf19224b480f1bd4829331bac373882b3cb6687740d1977fd07bd8cf8fd93d0cdeaa290834286dc4b96641a43e0307200993beeb6748c6902eaa7d24523bf3bc SHA512 881886115604a7ec2634f621693177278bf3f6842dd42f64460e3afd26f302c2f8847e03b7bd83b354ae0366dcdfa057f16b1cbf64e8c5172d27d2bda7b98db9
-EBUILD tex-gyre-2.005.ebuild 431 BLAKE2B 5c4723ee309ffa3d7b1c2663d313027b817ea9f50f85c146c16c345bad10621b81323e063ef0751112c2f5429893a5be9e0927fcaec5e53fd5299670e4ee73d4 SHA512 d7b3e8cdf4565a92ba3c7c167dd9e30d69308a8e2b422154f4f8ed2565069581e6bfce782c2c81e9d1ba6461545db2fb7db1f2f5614eb174f102926b0a8d5f00
+EBUILD tex-gyre-2.005.ebuild 470 BLAKE2B 5c12796b0272a2bc80465e3c161d558ec5dfa214b3c4840bb901f913773aaee9b64b31bbf9973050e80b8349936ab62a68d4f5216d9da5a82decb109546eaa07 SHA512 fb1ad967a38454dc59a4d38f26cab759786689abf66b348dd01547933ac4ac2fe94fa556f0fe7453cc9b91cad4fefc0fb969e68d1abd2892329546a1fa4dcc0c
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/tex-gyre/tex-gyre-2.005.ebuild b/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
index d929c0188c21..be4712acd24f 100644
--- a/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
+++ b/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
@@ -6,7 +6,7 @@ inherit font
 
 DESCRIPTION="Extensive remake of freely available URW fonts"
 HOMEPAGE="http://www.gust.org.pl/projects/e-foundry/tex-gyre"
-SRC_URI="${HOMEPAGE}/whole/tg-${PV}otf.zip"
+SRC_URI="http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${PV}otf.zip"
 
 LICENSE="|| ( GFL LPPL-1.3c )" # legally equivalent
 SLOT="0"
diff --git a/media-fonts/zh-kcfonts/Manifest b/media-fonts/zh-kcfonts/Manifest
index b82ed53fbb0c..b3434764aa72 100644
--- a/media-fonts/zh-kcfonts/Manifest
+++ b/media-fonts/zh-kcfonts/Manifest
@@ -2,5 +2,5 @@ AUX kcfonts-1.05-code-fixups.patch 4629 BLAKE2B 26135dad3608b8161d39491576c42ef8
 AUX kcfonts-1.05-parallel-make.patch 289 BLAKE2B 8f23ea32c830425ecaa45b01713d2c85e073a66f4fd0edd9c3ee48d31119da012428031e5e978266c0f4a16d75a9b161bea282b6af8a2f4bb8347bfbe38e2710 SHA512 8e00add5e6ace48ec8de7e6960f50f634317c7e9f0b57c723b9b6ec8b8f0e8d92f81b5339302284d839a3b8af79880e0de0208473fcc3e4eab500cb47aa72964
 DIST kcfonts-1.05.tar.gz 903701 BLAKE2B 344017187fb5ff1a13cb9e05e84a56d38a7b7d14865ec471bf9c36c383f1681b1944346af2d3b1f67ba340b8101a968ef527f0a27ee7e5ac3837f1c67da33325 SHA512 a8b94e8f8095a8578ff340637bf4a197db56948d0d7ecda0d4f17da51bafc09080761f32894f88a54c88945f72b10a11dcb04e5841c19c4eb6852e263fb64209
 DIST zh-kcfonts-1.05-freebsd-aa_ad.patch.gz 4749 BLAKE2B 3d488977e76ae71587ced990816a85173b5a3196df3803ba517d99b8ad4244d59355a0b9c34d683c7cdf8b5660a0f411c9d544379caf0ddca1f8bef35eb7028b SHA512 2881c31ffc5b8fbc2e27edd6f139436da89bd3db3a654bbcb4b8f037db0388bf592b83014b750057264694040c8f2c3d28718f46ad3cf1fe5e13256df7666fae
-EBUILD zh-kcfonts-1.05-r3.ebuild 949 BLAKE2B 2ff20122b137b1a78fbb5ee2bbc8b1cdd6a0e787eea8fee2790ddaa016874d482a403de0ebdbb931c345b069553c333286bd53f3f44569e7565ccf40397481b1 SHA512 c923fe22b1f017d9e46350808e97ad5adce6dd544b4919603c34d5a0c0bfe19ef481521881b87631e500b34834c72f2bd5c73edf205aa2e0037e6a2ad065cbfe
+EBUILD zh-kcfonts-1.05-r3.ebuild 954 BLAKE2B 48860f25e107c9c8d63bab5879aa1dc52acee33265972b74f331dcc2a2b9229a374a7b5cbfc8c8f521d51c067516ef76a1889d28560c1969529be09e2684bbda SHA512 56f501a78f4339284cdacc865c472845553907592950b89e15637a1ab96d31c9aeab10024f4da1fc2c5fbef4b6135b72547c4e5e92fec5acd5d3aa995d38a413
 MISC metadata.xml 325 BLAKE2B 34e6ba11f6f4787d8e8461b289d83f3f1064f8bbd969d83d34e336e5427455a2d67186fc189f2d60a752fc02bd761702d7a8565b1ee95825bec740e395c67352 SHA512 08906f63ec5cd92c530ffbb4bd4075cbf162186929e8935cafdb1145eae9a0c79c54c3a21b1311304c040b9f5b893f194e4c646ca0b1fd1781a801bf206f9c41
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
index c08fdae5871d..0863e1f9150e 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 	ftp://wm28.csie.ncu.edu.tw/pub/distfiles/${MY_P}.tar.gz
 	https://dev.gentoo.org/~soap/distfiles/${P}-freebsd-aa_ad.patch.gz"
 
-LICENSE="freedist"
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""