gentoo resync : 21.06.2020

12 files changed, 91 insertions, 102 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index cf1929e444cf..e43c266ab1df 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index e1be899aacbc..59c45b5dd592 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 4616 BLAKE2B a0c96d78a6bf289946bedf206e2f47a474e82aaadd51c27186772d10665c1f3eb8d0aeff180bf0be85ebd2e79b0619f7eeea9df18c1403fa73eba065510ec063 SHA512 536da7d52ec4831dc8b1c0a0c1dae7838d86a850c524bf76a8c23d3491429e24b1f3dddb658200c27f3b3e02709df85a2c735ebcb0d36dbf5816cc8ba4560979
-EBUILD culmus-0.133.ebuild 4623 BLAKE2B 1786ff454a51017f5887b0136faa6678c66fabb7a2f81b9c41f0056c498a20251e99a8f9daba1d7755890fb690f6933e173bd0053680e3e698c0bd2d5a5e8e3f SHA512 0258c97d4f508c07cc98a61e8cd63641c06b45e5353f67d19b7e294f639c2089bb991e4052c8271003c73edbff45eec956a922d820d67e1eba0063d77558530b
+EBUILD culmus-0.120-r5.ebuild 4632 BLAKE2B 11b67941cf7b0c7fc7bf06fefd1f40cc312f1fbfd42343968fc391123ea94b9e140cd07084af03e5301a6e48e4f75e8e4e124e5901cd2ed593801def59d8ffb9 SHA512 57d1568fd50188a190c31d6cf226a71d60d871611c7b9f0d2e8761fa0a36fb9ac5dcaa478aec599ed4216267acdfae7671039188dca346874b719b670d90aca5
+EBUILD culmus-0.133.ebuild 4639 BLAKE2B 6df802e7d531ed9f6a036439fa9ff96d61c98d564e496481489687a4e41029bed354a8f242b74a1e42c5a99702622ada5159c9090bf78f1a89243be5c101bcf3 SHA512 cb21d9308c4f1ed715f03ddfe096e54eec50ffc14586302802a7736ab18e92adb4537e962fbfa37aa1c483ce190cc514fe61985c377f743e9c2687eeb5a7df63
 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 6c737c0f48d3..95a55a83564e 100644
--- a/media-fonts/culmus/culmus-0.120-r5.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r5.ebuild
@@ -44,6 +44,7 @@ FONT_CONF=( "${T}/65-culmus.conf" )
 RDEPEND="!media-fonts/culmus-ancient"
 # >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight support is required
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	>=x11-apps/mkfontscale-1.0.9-r1
 	fontforge? ( media-gfx/fontforge )"
 
diff --git a/media-fonts/culmus/culmus-0.133.ebuild b/media-fonts/culmus/culmus-0.133.ebuild
index a66e3311e3c8..9d57b2ead28a 100644
--- a/media-fonts/culmus/culmus-0.133.ebuild
+++ b/media-fonts/culmus/culmus-0.133.ebuild
@@ -44,6 +44,7 @@ FONT_CONF=( "${T}/65-culmus.conf" )
 RDEPEND="!media-fonts/culmus-ancient"
 # >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight support is required
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	>=x11-apps/mkfontscale-1.0.9-r1
 	fontforge? ( media-gfx/fontforge )"
 
diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index f325cc249787..020af95f9497 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -2,9 +2,11 @@ DIST fontawesome-4.7.0.tar.gz 2672776 BLAKE2B c20474c0167665d82fcbe74984ad9c44fa
 DIST fontawesome-5.1.0.tar.gz 10505651 BLAKE2B 0ec84cdf36855ba43e5858b2e8b12a93c9ec950216b64fa307e1fa058e05f83f08c820e4a3b95432e30c33ee4efe5931bee7077ff182d52725068c53bf387b6f SHA512 1f35f0d326e1f896b606d851577fe99639c164101f236c47966289a8a7e3b1e64fea3f1338d12f327777db56ec35b1fcb5d6de250276bcb468fec114d4c3928f
 DIST fontawesome-5.11.2.tar.gz 10542743 BLAKE2B d17afa447acfa56ad42b6f36c6fd7ec049434028c00259f53f36d0896e2a679f83880c8e71f277316728d1ba5f18cf4af7cb22a935b0a300acc423bc02790fa8 SHA512 14267debf243aa3210125b4e45a2ab41cbcab599f2abab42e64432ff7b1f6b5716724012bc973b77bcee1b2d488738720ffa9b4f6ebaf8f4cc3375ff066fb72a
 DIST fontawesome-5.13.0.tar.gz 10998459 BLAKE2B 69ddfb0d8b3bb1a15911445b934cf0321e645164b34fc9f7844f0df04840a3e8d4d425b14589341cec0613ea4f2109678250198a1d5002e69c394eb053ceb4a2 SHA512 9fd3e1115acef6ac84667cf546374b204b947e229e4c645ab33f51026e993689a8295e7c0b02c88d735c4399efcd454f4252dcde7008eefb85c13846bf7c5bc4
+DIST fontawesome-5.13.1.tar.gz 11116775 BLAKE2B 701c28e77cfdc59226a92baaea24bc8168b81982703459df543659443217e2b39b6cfb58f98fa189a9381562c346e8b00c18a5f02ba1af1561cec141e07e2faf SHA512 944d34b1e7519f7eeb6aa8207766aaa6e278dc9b4926d52cae6196824bf3a52c19b23f068c7334435cb205c8c37d5af62cf6fec91ae4641492c48f9cf03962cf
 EBUILD fontawesome-4.7.0.ebuild 598 BLAKE2B 01c3f14e7a3ca641bb70397916f048d7b3e0980caf98e872e02d2f17f44478374e986817060627cb30b131f677c12746fd9dca0e4f89deb2e742bb1d2e5593ba SHA512 bb2d606384eef7dfa4208f26aae0126bc40a4c99a2fe8eabe89f6daf22f469bec12cdc88e2530ee2302f0b6cc353ee62f82a13148770ee757d21503555f35ec9
 EBUILD fontawesome-5.1.0.ebuild 693 BLAKE2B 7136a16eda143e81654f40f4da627e2860a9e0fa44a3fe448a469b57c71861aacfd55b678023583b163b6973daf9b8ca30a5369be01d4b66d551a735ab68ef06 SHA512 394d61d25dc52ef6a224f2a4a44d2db372980e583ec5f5f48003c2e1ec60fab5d299419f77cb85977fb0f96f06c3cea368f4add6a93d8fed53207b3e18d0b82b
 EBUILD fontawesome-5.11.2.ebuild 632 BLAKE2B 3b3dc924017b666cee3963adc699eec7379fbb48373aa41dc9d8ef03a36576546e1672f1972cd31eba6326acccfb8c6139db92f9333a5910ba4294f08ce98e5b SHA512 d3d68891772b54d39eadd666d1ddd030b8763e2c458cf8451f1d3c22e0d21ab6378e80c2256e4d111b9f1cf5faf5df938c08fb818e0c197f634309e29b3f088f
 EBUILD fontawesome-5.13.0.ebuild 754 BLAKE2B 8139cd34cc29526704c92f777f7778f1d5a1bca619479c68f9de347478eaad7dd69f2a3c468b212ead81c82f4f6fb76f9a4553d94b357f647fdba553c8f2ce6d SHA512 8b3c9eb248460a0b0a2a507af8cc7cfd372b3f15da80400d54c148aa581b4bb6d7cb68706a1a33cc6091af367b330c32ab8d6323451bb7f09245cd135b793469
+EBUILD fontawesome-5.13.1.ebuild 754 BLAKE2B 8139cd34cc29526704c92f777f7778f1d5a1bca619479c68f9de347478eaad7dd69f2a3c468b212ead81c82f4f6fb76f9a4553d94b357f647fdba553c8f2ce6d SHA512 8b3c9eb248460a0b0a2a507af8cc7cfd372b3f15da80400d54c148aa581b4bb6d7cb68706a1a33cc6091af367b330c32ab8d6323451bb7f09245cd135b793469
 EBUILD fontawesome-9999.ebuild 754 BLAKE2B 8139cd34cc29526704c92f777f7778f1d5a1bca619479c68f9de347478eaad7dd69f2a3c468b212ead81c82f4f6fb76f9a4553d94b357f647fdba553c8f2ce6d SHA512 8b3c9eb248460a0b0a2a507af8cc7cfd372b3f15da80400d54c148aa581b4bb6d7cb68706a1a33cc6091af367b330c32ab8d6323451bb7f09245cd135b793469
 MISC metadata.xml 532 BLAKE2B 2a4d5bb78ff9948de3569171165e91bc9391863412dab5236ff996182671decde9ba0339d059c3ec2e58670c362ea7f49dab9b5e1abfc6d277c62a6c8f2dcd08 SHA512 862296f7e1ea8fa2fd4acbbe2d679df47076ad290bc6d571f15971c590745c47f3c7dba39d823411a0228aff71aedbb77b739fd4cfac990eed54f48c85406904
diff --git a/media-fonts/fontawesome/fontawesome-5.13.1.ebuild b/media-fonts/fontawesome/fontawesome-5.13.1.ebuild
new file mode 100644
index 000000000000..ec7c7068ea32
--- /dev/null
+++ b/media-fonts/fontawesome/fontawesome-5.13.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Font-Awesome"
+inherit font
+
+DESCRIPTION="The iconic font"
+HOMEPAGE="https://fontawesome.com"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FortAwesome/${MY_PN}.git"
+else
+	SRC_URI="https://github.com/FortAwesome/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="CC-BY-4.0 OFL-1.1"
+SLOT="0/5"
+IUSE="+otf ttf"
+
+REQUIRED_USE="|| ( otf ttf )"
+
+src_install() {
+	if use otf; then
+		FONT_S="${S}/otfs" FONT_SUFFIX="otf" font_src_install
+	fi
+	if use ttf; then
+		FONT_S="${S}/webfonts" FONT_SUFFIX="ttf" font_src_install
+	fi
+}
diff --git a/media-fonts/source-han-sans/Manifest b/media-fonts/source-han-sans/Manifest
index 2db108d80a77..3f96ec72b7a8 100644
--- a/media-fonts/source-han-sans/Manifest
+++ b/media-fonts/source-han-sans/Manifest
@@ -7,5 +7,5 @@ DIST source-han-sans-zh_CN-1.004.zip 50414779 BLAKE2B 61501ac790b4ab88ae48bbcfd3
 DIST source-han-sans-zh_TW-1.001.tar.xz 28238164 BLAKE2B 626bf22de0bf3aeaeb3ee552b13af62a0ad08b654662abd1e12231fbc55d9f3e1bcf473751a13438f8f8bc54a3e75d9f50cd92706548b8c9f50a0e2b68c5a993 SHA512 909b9a8ce3f28a878b806bf89b7016f31842c333b388db618cbe4acc005e2e0f53af6cfad4fe6957575b8743363ded4568a49b62a65f044d409b0464fe096e39
 DIST source-han-sans-zh_TW-1.004.zip 34014710 BLAKE2B 1cb3b344f8d9813b27ea79c6e08ec2c462567cb09325267d1d0dd2e463bef5935d4fd42af8ef8d16dd9b2441e2b2fd0cd323f5065abeddbd911a187a05f6205a SHA512 8e1a7ec36a368499cf132ef63dc531c61a19374eedcbc99c6937ef5d2c1e557662e79b796fa8df5e211ffce6fdf290186a235a357b0a2af75a103f3223b5f914
 EBUILD source-han-sans-1.001.ebuild 1179 BLAKE2B 1fae49301941beb5d9df1a6cb8095c4c9726dc5bda203c76c6c454483f1607966388c3f8ffc3d8a860a16507a5fe659cd82d7fe3632e5032e17e3a3d624c4dd5 SHA512 d1ac97c29f22a93001f904b6ee21bbfb9cd696e805d7727cc8a50882d312d2b798b1591a9a95d50f218a84838cf50f15f18116ff4b387c560b025fbfa470a509
-EBUILD source-han-sans-1.004.ebuild 1414 BLAKE2B 4af12e604bb2cbfc97596b89534ecf33aa49b0c16fe0f2109e268f91132e2202ee619ff39a8906a7541566181f267187a41b9703905ea6ba1a2d78ccf1485956 SHA512 e5c99d625ff89bc615308d50f1514f7fc85f62988ebdf9a0f9ef45b34d5f6b5625630fb275ff8287b9798d6366ca4ce761215bde775d62bcdc8b03fa901a140f
+EBUILD source-han-sans-1.004.ebuild 1439 BLAKE2B 39a21713aee74e1af975a004c07dc97a441c055a17e10993b4244e743a3fb8d5112deedb5cfc2dbb1216c65cd9248fb4414f7221cc2d4a26185ef98ab5f33477 SHA512 3063b5a2771a947bd2f30773c4377680bfc94dab8d703ce9d63f076df0feb2976d2ec464ace8e8178235ebbe7ca2362eb2c9fa78204352f5a14bf472b72be064
 MISC metadata.xml 340 BLAKE2B e438d0602a5083518c7127bae4b5398626a5ab65ec212bd715066df46c49808fb7c67f73a3d781c18071313f0ce94f0dab70e0ef08b755afcd6dcf0b240469e5 SHA512 89b73d0ce559881bdfd73fcb8e366d62317f6a6fec265f5d39d976bf83ee4a11a446a278c5489d871d612af77e68e7e891e1f90822ed3c34afa1cc4d3804eff3
diff --git a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
index 6ab8669f1653..44b627b242ae 100644
--- a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
+++ b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
@@ -26,6 +26,8 @@ S=${WORKDIR}
 FONT_SUFFIX="otf"
 RESTRICT="binchecks strip"
 
+DEPEND="app-arch/unzip"
+
 src_install() {
 	use l10n_ja && FONT_S="${S}/SourceHanSansJP" font_src_install
 	use l10n_ko && FONT_S="${S}/SourceHanSansKR" font_src_install
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 39ecba31f724..5fa2e40e2b63 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,7 +1,4 @@
-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 2609 BLAKE2B 5b7d71a268c473e7a2a610c8128912e84ef6b8f6b2979589bd2a551acd0df74962a1b29080198d61be0ad760e400940e33c18dc24feee3e85fb5a56ac53f4718 SHA512 eff0f4526b709be6e08b98a397f545207486eb0b6381f6c3ed8d44e18dcf0f9384a595bf265b3eb79527b1a9f46281c10b244c9a1e2bfd57172091476662e900
-EBUILD terminus-font-4.47.ebuild 2619 BLAKE2B 1cf9adc9fa5222739e04c8dd9b159d4897a131bf509d74d3f631520db480847dd84003d523536bdbe55de20153e9827bd7a967ba7f1e49770522d09533c439a0 SHA512 366a3fcb139755d46be6cda7d2d7d2dbaed5cb8fa0f5d6b8c72f92e5c81ad591e69b5d008670976b7c6d363e88951a77e09175abfa7767709167f172e5dc5b7c
+EBUILD terminus-font-4.48-r2.ebuild 4067 BLAKE2B 0fdb04e8ff8b62f1f6b48cf9bb3470b400d0aa81e89cb2ae197340d973bed31ab76d85fc26f77f57a4da13a0a269ffc63dcac3b05675a3d3f12f05cfc40aed3e SHA512 398fbf47ae0163db467e98837f2764655de0738b7cb1bbcaa64e3fa0f12dbec3a001cad4a557f593b1fa9eb06e04ad35727e74cc06fb77519a3b2b8aff1202c7
 EBUILD terminus-font-4.48.ebuild 2615 BLAKE2B 59fd038e23e2df28f9af2e8b14aa438a1af5ed1e172e15788b07da8035357d72fcfafa3c406ee5e42e1fc67d1066c2be2f29fbfacacb3d18383ca1d2a27e6498 SHA512 205c101eeafdca6b04e8fccff95782cbc45ef8d05805bec1c12cb697d55e9af004a747c455204013c768d5cebc24bdbc2a94160fc8843de008d6d634ac29c0be
-MISC metadata.xml 1568 BLAKE2B 47b12c122ee6823023bbc4844474e5f2eaad16bfd5f0853ff192c60c007a3fc03353a64f26d824fd43ae96d5044bdaccbbc2fe75177080f76a9db69ff8f44b6a SHA512 6255452e74da62e7b081fdb8a3eb4069e4419503d7364cac2ff1c014858482b99713a33a18b1b8bc3bdc409a90b2d6e03421e07559f74f4c8f0ae132d9940d96
+MISC metadata.xml 1787 BLAKE2B f83cf459e35bae521d4f6176c7d873cbde7413ca52241feaf442c818a9e1c30640cca1127788737da53eb659ab73913471d830f0234198880fca33aafe811678 SHA512 8dbb13ccb276600255a0188254098e78540f54b4ff5a481909c94e15519b1cbf58dd58f5f4c44adbd48252da22579fff8d1d4301eb798c466132ab820609affe
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index 0dd408f312e3..8663bbf27f9f 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -5,6 +5,10 @@
     <email>fonts@gentoo.org</email>
     <name>Fonts</name>
   </maintainer>
+  <maintainer type="person">
+    <email>slyfox@gentoo.org</email>
+    <name>Sergei Trofimovich</name>
+  </maintainer>
   <use>
     <flag name="a-like-o">
       Changes view of letter 'a' - a looks like o (see homepage)
@@ -12,6 +16,9 @@
     <flag name="distinct-l">
       ll2 variant with more distinctive l (lowercase L)
     </flag>
+    <flag name="otf">
+      Install Open Type Font (OTF) (required for HarfBuzz backend)
+    </flag>
     <flag name="pcf">
       Install Portable Compiled Font (PCF) (required for X11)
     </flag>
diff --git a/media-fonts/terminus-font/terminus-font-4.46.ebuild b/media-fonts/terminus-font/terminus-font-4.46.ebuild
deleted file mode 100644
index 017cb8d501b9..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.46.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit font python-any-r1
-
-DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://terminus-font.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="OFL-1.1 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
-	ru-dv +ru-g ru-i ru-k"
-
-DEPEND="app-arch/gzip
-	${PYTHON_DEPS}
-	virtual/awk
-	pcf? ( x11-apps/bdftopcf )"
-RDEPEND=""
-
-FONTDIR=/usr/share/fonts/terminus
-FONT_CONF=( 75-yes-terminus.conf )
-DOCS=( README README-BG AUTHORS CHANGES )
-
-REQUIRED_USE="X? ( pcf )"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	default
-
-	# Upstream patches. Some of them are suggested to be applied by default
-	# dv - de NOT like latin g, but like caps greek delta
-	#      ve NOT like greek beta, but like caps latin B
-	# ge - ge NOT like "mirrored" latin s, but like caps greek gamma
-	# ka - small ka NOT like minimised caps latin K, but like small latin k
-	use a-like-o 		&& eapply "${S}"/alt/ao2.diff
-	use center-tilde 	&& eapply "${S}"/alt/td1.diff
-	use distinct-l 		&& eapply "${S}"/alt/ll2.diff
-	use ru-i     		&& eapply "${S}"/alt/ij1.diff
-	use ru-k     		&& eapply "${S}"/alt/ka2.diff
-	use ru-dv    		&& eapply "${S}"/alt/dv1.diff
-	use ru-g     		&& eapply "${S}"/alt/ge2.diff
-	use quote    		&& eapply "${S}"/alt/gq2.diff
-}
-
-src_configure() {
-	local configure_args=(
-		--prefix="${EPREFIX}"/usr
-		--psfdir="${EPREFIX}"/usr/share/consolefonts
-		--x11dir="${EPREFIX}"/${FONTDIR}
-	)
-	# selfwritten configure script
-	./configure "${configure_args[@]}" || die
-}
-
-src_compile() {
-	local args=(
-		$(usex psf 'psf psf-vgaw' '')
-		$(usex pcf 'pcf pcf-8bit' '')
-	)
-	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
-}
-
-src_install() {
-	local args=(
-		$(usex psf 'install-psf install-psf-vgaw install-psf-ref' '')
-		$(usex pcf 'install-pcf' '')
-	)
-	# Set the CHECKDIR to a dummy location so we always get the same set of
-	# files installed regardless of what is in / or ROOT or wherever.
-	[[ ${#args[@]} -gt 0 ]] && emake DESTDIR="${D}" CHECKDIR="${D}" "${args[@]}"
-
-	# Remove trans files that the kbd package takes care of installing.
-	rm -f "${ED}"/usr/share/consoletrans/*.trans
-
-	if use pcf-unicode-only; then
-		# Only the ter-x* fonts are unicode (ISO-10646-1) based
-		rm -f "${ED}"/usr/share/fonts/terminus/ter-[0-9a-wy-z]* || die
-	fi
-
-	font_src_install
-
-	einstalldocs
-}
diff --git a/media-fonts/terminus-font/terminus-font-4.47.ebuild b/media-fonts/terminus-font/terminus-font-4.48-r2.ebuild
index 40ce47872db1..97c8223d54e4 100644
--- a/media-fonts/terminus-font/terminus-font-4.47.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.48-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit font python-any-r1
 
 DESCRIPTION="A clean fixed font for the console and X11"
@@ -13,12 +13,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
+IUSE="a-like-o +center-tilde distinct-l otf +pcf +pcf-unicode-only +psf quote
 	ru-dv +ru-g ru-i ru-k"
 
 DEPEND="app-arch/gzip
 	${PYTHON_DEPS}
 	virtual/awk
+	otf? ( media-gfx/fontforge )
 	pcf? ( x11-apps/bdftopcf )"
 RDEPEND=""
 
@@ -66,6 +67,41 @@ src_compile() {
 		$(usex pcf 'pcf pcf-8bit' '')
 	)
 	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
+
+	# Follow https://bugs.gentoo.org/728308#c5
+	# build ".otf" (bitmap-only) fonts out of .bdf ones
+	#
+	# Important details (copying notes as-is):
+	#
+	# 0. Pango 1.44 now returns floating point ascent and
+	# descent, instead of integer. The functions were always returning float,
+	# all right... but so far, without a fractional part. Which makes problems
+	# too, for example in Scintilla based editors such as SciTE and Geany
+	# (there is a quick and dirty fix).
+	#
+	# 1. 'fonttosfnt' adds 0.5 to at least the logical (OpenType-scaled)
+	# character width, ascent and height. Haven't checked the physical (pixel)
+	# metrics yet. With some sizes/applications, the fonttosfnt converted
+	# fonts do indeed have extra wrong spacing, 1 pixel horizontal or
+	# vertical. It has other bugs too, but they don't seem important.
+	#
+	# 2. If you pack 2+ terminus sizes into a single .otb font file, KDE will
+	# (may? YMMV) use *only the first size*.
+	#
+	# 3. OTB has a single set of logical metrics. So, for example, the logical
+	# character width (which is relative to height) can never be correct for
+	# an .otb file including both 8x14 and 8x16.
+
+	if use otf; then
+		local source_bdf
+		for source_bdf in ter-u*n.bdf ter-u*b.bdf; do
+			set -- 	fontforge -lang=ff -c 'Open($1); ScaleToEm(1024); Generate($2)' \
+				"${source_bdf}" "${source_bdf%.bdf}.otb"
+			einfo "$@"
+			"$@" || die
+		done
+	fi
+
 }
 
 src_install() {
@@ -85,6 +121,7 @@ src_install() {
 		rm -f "${ED}"/usr/share/fonts/terminus/ter-[0-9a-wy-z]* || die
 	fi
 
+	use otf && FONT_SUFFIX=otb
 	font_src_install
 
 	einstalldocs