gentoo resync : 18.08.2019

13 files changed, 138 insertions, 188 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 6b830ee7f9ff..6416945f2332 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index 22008730cb5f..c8921913b0d2 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -19,6 +19,5 @@ 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-r4.ebuild 4612 BLAKE2B e94029a3b7ad41261dc4925959f2a0b735857232d862880edd9fcf8b8fac7e6c3bd3e539bceb96ae29ac10e13d9b498cf1b29347a907c9580494f0bfe96d05ba SHA512 5f33a6f2d7c618a881d6156dbac171579cc89ea4346be8c9fd077c03ba19592b17e40e5f922f32061273c2ec6255d466fd44598eda4fe543534f5339a96f271d
-EBUILD culmus-0.120-r5.ebuild 4636 BLAKE2B 1fd9b9f3c77587064336c05a6c096c70e57a42369875a2a6d60511c865ea54e4324ee8b6e65d6067d75fca197259e6fdf06c94e492898385b1db4973b59f271d SHA512 c81e289a5775c768eb9b4a59dbac619fb2273d83de9e6c75d281226e8f4cd9927f734d072a48d037146e7de572585d559873422c3b3e50f50132e258e7af7200
+EBUILD culmus-0.120-r5.ebuild 4635 BLAKE2B 5999d8f0840d3f97940b0cb02d28f7b2795a536f3e1aa83fe218621576003fa8e151db8ae9bc8e95eb071c6be741b02cbe6dc6ee934acc15a401069e5b1d73ab SHA512 33f12c82bf9631f27cf9f8af9d9017d17c606ce326ae204b69892208e8223b5fe12383dfc0a1bfe51e988038358c1c5bcb2eed8a21a6a88e36418575c5a5a29d
 MISC metadata.xml 583 BLAKE2B 824a24c5f7812a73e49afa35f98ef8b31465dc797fae6048a057be7253d87d4d41da698550fc237fd2f1ce584e6d80d005361c98dd1964da9b9f6ddf222095ef SHA512 38b8e8dfc13787e2bfed9f0205e7a8ab7109634af52cf29acf8f1301eda8499725e8ee0df4dbc47474913901ea99446f16bcf82fced23a8961a70b60cc8beb01
diff --git a/media-fonts/culmus/culmus-0.120-r4.ebuild b/media-fonts/culmus/culmus-0.120-r4.ebuild
deleted file mode 100644
index 4388a4b0bda9..000000000000
--- a/media-fonts/culmus/culmus-0.120-r4.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit font
-
-# Maintainer: also check culmus.conf file in ${P}.tar.gz
-
-MY_A_P=AncientSemiticFonts-0.06-1
-# The Type 1 fonts are just a stripped version of TrueType fonts and they are
-# not updated unless there is a meaningful change and we need them for
-# culmus-latex, see bug #350657
-TYPE1_PV=0.105
-
-DESCRIPTION="Hebrew Type1 fonts"
-HOMEPAGE="http://culmus.sourceforge.net/"
-
-FANCY_FONTS="journal hillel anka comix gan ozrad ktav-yad dorian gladia horev"
-FANCY_YG_FONTS="ShmuelCLM MakabiYG"
-TAAMEY_FONTS="TaameyDavidCLM TaameyFrankCLM KeterAramTsova KeterYG"
-
-SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
-	mirror://sourceforge/culmus/${PN}-type1-${TYPE1_PV}.tar.gz
-	fontforge? ( mirror://sourceforge/culmus/${PN}-src-${PV}.tar.gz )
-	ancient? ( !fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.TTF.tgz )
-		fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.tgz ) )"
-SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy/%s.tar.gz " ${FANCY_FONTS}) )"
-SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy-yg/%s.zip " ${FANCY_YG_FONTS}) )"
-SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${TAAMEY_FONTS}) )"
-
-# Some fonts are available in otf format too. Do we need them?
-#	http://culmus.sourceforge.net/fancy/anka-otf.zip
-#	http://culmus.sourceforge.net/fancy/hillel-otf.zip
-#	http://culmus.sourceforge.net/fancy/journal-otf.zip
-
-LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ancient fancy fontforge taamey"
-
-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}
-	>=x11-apps/mkfontscale-1.0.9-r1
-	fontforge? ( media-gfx/fontforge )"
-
-S=${WORKDIR}
-# Put all fonts, generated or not here
-FONT_S=${S}/FONTS
-
-src_unpack() {
-	unpack ${P}.tar.gz # For type1 fonts...
-	unpack ${PN}-type1-${TYPE1_PV}.tar.gz
-	use fontforge && unpack ${PN}-src-${PV}.tar.gz
-
-	use ancient && unpack ${MY_A_P}$(use fontforge || echo .TTF).tgz
-
-	if use fancy; then
-		unpack $(printf "%s.tar.gz " ${FANCY_FONTS})
-		unpack $(printf "%s.zip " ${FANCY_YG_FONTS})
-		mv TTF/* .
-	fi
-
-	if use taamey; then
-		for font in ${TAAMEY_FONTS}; do
-			mkdir ${font}
-			pushd ${font}
-			unpack ${font}.zip
-			popd >/dev/null
-		done
-	fi
-}
-
-src_prepare() {
-	cp "${P}/culmus.conf" "${T}/65-culmus.conf" || die
-}
-
-src_compile() {
-	mkdir -p "${FONT_S}"
-	if use fontforge; then
-		pushd ${P}
-		mv *.afm *.pfa "${FONT_S}"
-		rm *.ttf
-		popd >/dev/null
-
-		pushd ${PN}-type1-${TYPE1_PV}
-		mv *.afm *.pfa "${FONT_S}"
-		popd >/dev/null
-
-		pushd ${PN}-src-${PV}
-		for f in *.sfd; do
-			"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-		done
-		popd >/dev/null
-
-		if use ancient; then
-			pushd ${MY_A_P}/src
-			export FONTFORGE_LANGUAGE=ff
-			make clean
-			make all || die "Failed to build fonts"
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
-		fi
-
-		if use taamey; then
-			for font in ${TAAMEY_FONTS}; do
-				rm -rf ${font}/TTF
-				pushd ${font}/SFD
-				for f in *.sfd; do
-					"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-				done
-				popd >/dev/null
-			done
-		fi
-	else
-		pushd ${P}
-		mv *.afm *.pfa *.ttf "${FONT_S}"
-		popd >/dev/null
-
-		pushd ${PN}-type1-${TYPE1_PV}
-		mv *.afm *.pfa "${FONT_S}"
-		popd >/dev/null
-
-		if use ancient; then
-			pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
-		fi
-
-		if use taamey; then
-			for font in ${TAAMEY_FONTS}; do
-				pushd ${font}/TTF
-				mv *.ttf "${FONT_S}"
-				popd >/dev/null
-			done
-		fi
-	fi
-
-	use fancy && mv *.afm *.pfa *.ttf "${FONT_S}"
-}
-
-src_install() {
-	FONT_SUFFIX="pfa afm $((use fancy || use taamey) && echo ttf)" \
-		font_src_install
-
-	rm -rf "${FONT_S}"
-	find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' |
-		while read font; do
-			ewarn "QA: missed font file: ${font}"
-		done
-
-	pushd ${PN}$(use fontforge && echo -src)-${PV}
-	dodoc CHANGES || die
-	popd >/dev/null
-
-	if use ancient; then
-		pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/"
-		newdoc CHANGES{,.ancient} || die
-		newdoc README{,.ancient} || die
-		popd >/dev/null
-	fi
-
-	if use taamey; then
-		for font in ${TAAMEY_FONTS}; do
-			pushd ${font}
-			[[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; }
-			newdoc README{,.${font}} || die
-			insinto /usr/share/doc/${PF}/${font}
-			doins -r Samples
-			popd >/dev/null
-		done
-	fi
-}
diff --git a/media-fonts/culmus/culmus-0.120-r5.ebuild b/media-fonts/culmus/culmus-0.120-r5.ebuild
index a1fae8a819ae..459dcc39ef6c 100644
--- a/media-fonts/culmus/culmus-0.120-r5.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r5.ebuild
@@ -36,7 +36,7 @@ SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${T
 
 LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="ancient fancy fontforge taamey"
 
 FONT_CONF=( "${T}/65-culmus.conf" )
diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index 2fbd080981c6..a9fd0d25db80 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -1,9 +1,11 @@
 DIST fontawesome-4.7.0.tar.gz 2672776 BLAKE2B c20474c0167665d82fcbe74984ad9c44fa1155a2a5363222981d6c32f40a3bf13bfc2c582d78e8d36e57939f8af3810fa823f2241d1924a83a05c79ed08cface SHA512 913e5eec2211111e9601c92059745344766f4c3a6f3563cbc6f8a5f3850a0101bab8f3f992a97c6f1c264a2bbb5163f3feecc6b3f64fcb22c9592d2d38cc777d
 DIST fontawesome-5.1.0.tar.gz 10505651 BLAKE2B 0ec84cdf36855ba43e5858b2e8b12a93c9ec950216b64fa307e1fa058e05f83f08c820e4a3b95432e30c33ee4efe5931bee7077ff182d52725068c53bf387b6f SHA512 1f35f0d326e1f896b606d851577fe99639c164101f236c47966289a8a7e3b1e64fea3f1338d12f327777db56ec35b1fcb5d6de250276bcb468fec114d4c3928f
+DIST fontawesome-5.10.1.tar.gz 10460219 BLAKE2B 6e1fc8e56cbc8bdbb4be3df6c8f397a69a6fbedc628418a26514df099d9f1c152ef6c5be7f5893a65628ded1553352c6dc55f47cf49f51f983a448483b0f5457 SHA512 74053b61e742def0cab8a74f90c4d08035093011afb5de65419e162a9502b367e3b3bb98d422ceac6e1289e5181d613582bf3e6dfe05be7fdde065dc96564009
 DIST fontawesome-5.9.0.tar.gz 10407351 BLAKE2B 2e55f8237033c0daad7028a2e10d5f893b03aeb3c49c26c367c5e8107c2c17900694d424ca76e262f15750e21a74d5a747798da4e21a5c69a809bb89594d755f SHA512 6347f21fb47d779f2a39b9205e8edbac09b3feef88cee103052d5bbba7f857d97e485c659c69edd6053f9af7561f0b260b38eb90b570a3d0a74fe634d723c0cf
 DIST fontawesome-free-5.0.6.zip 21098097 BLAKE2B 981220261e29dc9894eee1b829af4815176d566ce6309a3d356fdb8c5e5e9a1f4ccadd522c70f51088aebfcbb4c85ea593916ce09a129a85ef9ebf711f253ccb SHA512 cb5ad12b2b40687bca0624e9424ff483e5af4c7da1ef032b58698d00bb32c5385c0d5fe40892c252af66a5470843a092442aa14d7936cb6af30066efd07b53b5
-EBUILD fontawesome-4.7.0.ebuild 605 BLAKE2B a2ab612d6c2b1ef834dcb384391383f1bcce2df7d3ad01e9349f50f604b510d3e782aa3dafdb6e45dc9b5ddb29c7666fa1c291f1853ecbaa7f16b85ae2a554ce SHA512 35d1c23ba8a514c33424b9806a142059cc522ed99e1ae69df543b81482bb09f97cd056e037f7862abb777b557c8cf464c1c89fc90100e52e39aabae463afef6e
+EBUILD fontawesome-4.7.0.ebuild 599 BLAKE2B c5df5a5878a75ed80d1c9fba6341a451f6b0851cea7086fb3559ae650d774f1fbde7a04ef624c69381d5791af4297222addf84930403c9c868f240bef7818c06 SHA512 21b0109d6deb9e8cba6d43b4a9faaef02ce5bb325744d34d7f723a93eeaa4b46d05cd0a4e35f68a9abd6c22f4e6f064ce370e7e884e122189de11ca802a33372
 EBUILD fontawesome-5.0.6.ebuild 790 BLAKE2B b6fe16fc5ef3ac0ec831760e68fad46861037149282551a162ec608e8fee867c33cca1d030a1ec7dfa3133dd24c42d88bcecbbf72c0fc7039b8aa94c6d6ba172 SHA512 43f42587eac345820ea069905d5c5ed3d843157397b72f08cd62f02ea5cedccb4163535b8dd6562416eba99140e01d3d96aaeee91e2cb98a1e453eab632814ff
 EBUILD fontawesome-5.1.0.ebuild 693 BLAKE2B 7136a16eda143e81654f40f4da627e2860a9e0fa44a3fe448a469b57c71861aacfd55b678023583b163b6973daf9b8ca30a5369be01d4b66d551a735ab68ef06 SHA512 394d61d25dc52ef6a224f2a4a44d2db372980e583ec5f5f48003c2e1ec60fab5d299419f77cb85977fb0f96f06c3cea368f4add6a93d8fed53207b3e18d0b82b
+EBUILD fontawesome-5.10.1.ebuild 668 BLAKE2B 561c5d1ada4ce06a8d5691e247d7d400eebea4b9f3e6ab8d55f9ccd7ccdea043c47b77432fa69b45b4e8c96d3a694443377799815bffc52389ffe0d298081491 SHA512 a2f60fce3c14edfa6367b3a95e2475cc905043213fbb153c84add6fa97b9d397540de6c70dce863a63253517bfa399ab0cb66ff378a4b14eab8f674db23fad13
 EBUILD fontawesome-5.9.0.ebuild 668 BLAKE2B 561c5d1ada4ce06a8d5691e247d7d400eebea4b9f3e6ab8d55f9ccd7ccdea043c47b77432fa69b45b4e8c96d3a694443377799815bffc52389ffe0d298081491 SHA512 a2f60fce3c14edfa6367b3a95e2475cc905043213fbb153c84add6fa97b9d397540de6c70dce863a63253517bfa399ab0cb66ff378a4b14eab8f674db23fad13
 MISC metadata.xml 757 BLAKE2B 0052f352b2dd2ecf94c93033fb785bffac4f9d002257f7e6ecd5119c0df2c79add5cbad191ea4a2e1299ff52d045ed7e393344e15a4bccc59f8eb38be78266b3 SHA512 5527f5537b93e9ded68263ac22ad8f959efd923c221cfc882dc8f77bb5ed87e2657f01eabe18b7019fd5556927574c576448d08f65db473f47c2df3a3fcf0e4d
diff --git a/media-fonts/fontawesome/fontawesome-4.7.0.ebuild b/media-fonts/fontawesome/fontawesome-4.7.0.ebuild
index 2b9a2ca0b133..04e6bd276a82 100644
--- a/media-fonts/fontawesome/fontawesome-4.7.0.ebuild
+++ b/media-fonts/fontawesome/fontawesome-4.7.0.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/FortAwesome/${REPO_PN}/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="CC-BY-3.0 OFL-1.1"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+otf +ttf"
 
 REQUIRED_USE="|| ( otf ttf )"
diff --git a/media-fonts/fontawesome/fontawesome-5.10.1.ebuild b/media-fonts/fontawesome/fontawesome-5.10.1.ebuild
new file mode 100644
index 000000000000..18ae5f0a3c4f
--- /dev/null
+++ b/media-fonts/fontawesome/fontawesome-5.10.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="Font-Awesome"
+inherit font
+
+DESCRIPTION="The iconic font"
+HOMEPAGE="https://fontawesome.com"
+SRC_URI="https://github.com/FortAwesome/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 OFL-1.1"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+otf +ttf"
+
+REQUIRED_USE="|| ( otf ttf )"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+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/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index b4a48efcad21..47b6d07569ce 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -6,5 +6,5 @@ AUX noto-emoji-use-system-pngquant.patch 2118 BLAKE2B 55048756859ead78a013a6ff74
 DIST noto-emoji-20180823.tar.gz 51710829 BLAKE2B 66983bdd3cb5e95727f0ddebca5d85c3f22bb9e7b9216eb1af41c4cba19f2020592be3feb7ac47f723985574b8d57070d9d07d0ce5e5870512aecc2a55b52995 SHA512 73233f3742faae4e37f8588bda097fe9f745f5cc7e6601301c1dc9e30d656c496e074c80bf4391708f6c0dbe32043e8558e4395cce5dbf735772b0e41642b9bf
 DIST noto-emoji-20190328.tar.gz 51710517 BLAKE2B ecedc52d3bdc49281942e7cb6b217928ee57412a420da251855c702e444c5d720464093c173f2878c09b4ef7123aedcfc3aa6aa517a625749d414e4c3b08bd19 SHA512 9e775a18a43edadb24fee498a8dff588949475ba27c2daddc1dfb6eacc18d1bf8810ec88e018398f18efe9ff0c414766f569eec7a714e119f3aabdfbe3ceec98
 EBUILD noto-emoji-20180823.ebuild 1433 BLAKE2B a4df6d3336659a33bc91ddcb21b6b786110fbee82250f56ae449ed9407f7257006be5d36603b5e04220f18bed146346a15ee1a9f1a67bc3b115f641796e6aa79 SHA512 dc11f315255040b361e3a861ff172522eb5b31860e5ffa7cdb2ccf733fd7f374e497c7ab5115efaf7a7f75d7fa2f0a9a311ba7dd7c412d96e298bc3a243c017b
-EBUILD noto-emoji-20190328.ebuild 1353 BLAKE2B 08fe910ebfb5f50cb6a1897866458803d6118c59052a7209758090c503937eff6f619d989c0c3ff65865f6d64384a6943115f1fec17d5a72bdf0e65b3180f7e6 SHA512 62edd31cefd88d176bd04e1981194306350a521b2415e2bee1cede8da74d44513efa1c1f4e62b6553447b989fed930b6574ebd061b636a79b2910c1564de3635
+EBUILD noto-emoji-20190328.ebuild 1352 BLAKE2B 1373d589e510c430f5ae2163795d0a95e7cc33aeb2b83b160323295e3e192dddb4db6e395b27b17ea8866226df0a32668d4cac734aea43ef47c2974f6ab249eb SHA512 e473fa45303799b00129def4420ca5d3a5784b24477b691fddd61700c35f42e618c3ef6e8750e0f6716b4df73205a8ab635dbab75bfdb7fd5fd9edbb77a81d31
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/media-fonts/noto-emoji/noto-emoji-20190328.ebuild b/media-fonts/noto-emoji/noto-emoji-20190328.ebuild
index 0c67590eebb2..994ee91ee97a 100644
--- a/media-fonts/noto-emoji/noto-emoji-20190328.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20190328.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/googlei18n/noto-emoji/archive/${COMMIT}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 11736a97b4c1..61659ffed922 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,5 +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
-EBUILD terminus-font-4.46.ebuild 2630 BLAKE2B c20fe173e9266b4bb8dfea00e519edcfb245c4acd6cd2b8f863585d5cdefe61f51b2409575e8158c072c6e9bdac1522c916bafac6809fd0905cc792506dd5d5d SHA512 5e94f9a00710fe4f24fc7ea5fe7ca8922a160f05c9e2ee6729e40b3c647d643c409d2f9a6ca5cbd1c96fc438665d746e6e6502704889a59257bebefc101e3f45
-EBUILD terminus-font-4.47.ebuild 2637 BLAKE2B c29560133595140e6c1ebc717ac7cbfae99d56297a4ae1cbe54e1bcf577aa64a3a74e15282e4338a09de99241f875d0f2915f3b9740ca275862f9d391af505a0 SHA512 80f5a3cbcc3366887b9796a9a7049910635b658c7f0d07ef9daa8695066614ce71d8d299e22391f579c213c24ae078b7f0f01b04ab654c29d02c19be0aa7c910
+DIST terminus-font-4.48.tar.gz 620561 BLAKE2B 8ab977a0b4b529faa38d082969e10a8f0ca3860b745441ed8f45761b95869194226446c487bc7c5490d2a88d1836aa6152424d6646b63b9fbc11e43dc8e255d6 SHA512 5f45f7d0e7396f02158f4751aaafb3f0a3fb68dbe3e5501f86a5138c6d52f5106053e38c368d560e5979e29250074dbde5165702b8905a564d029663a2219af4
+EBUILD terminus-font-4.46.ebuild 2628 BLAKE2B 1b9f10db79f1c88567e57679049430ad5ded7432966c2098d36a4bb8343d4b3b5f48695fdbdc24dc046461ef70f5e7c5bdf5606338f9a9bf4bf4d7f2091aae2c SHA512 cdb46b7eb3a4e47943dce2fcdf2a4ad5ca936cdab5743b48a884ba78f1c9a5f22ab5633e3c1415f572ac54f6666be61d0bdd68ea30461d3b0b978f07c8f82e95
+EBUILD terminus-font-4.47.ebuild 2635 BLAKE2B d5e76d8442bd9042850f3510126aa1baf21df7d805be2ce3dda6be05a7742dcc6b5a5ddfe75fb25ddffe6bc1e343c6534bab0f74535a6fb0ce5483d7e0c93ea5 SHA512 7ae5d4953b8713d73927e90b1327c54bb38e9903b6d1026f0515c9d52e8f61f601f0200d759808306788c9b0c096aad2bb95f9547d915735e7c7082f6b345ec0
+EBUILD terminus-font-4.48.ebuild 2635 BLAKE2B d5e76d8442bd9042850f3510126aa1baf21df7d805be2ce3dda6be05a7742dcc6b5a5ddfe75fb25ddffe6bc1e343c6534bab0f74535a6fb0ce5483d7e0c93ea5 SHA512 7ae5d4953b8713d73927e90b1327c54bb38e9903b6d1026f0515c9d52e8f61f601f0200d759808306788c9b0c096aad2bb95f9547d915735e7c7082f6b345ec0
 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 aa6798a4dbad..2ec48a03373b 100644
--- a/media-fonts/terminus-font/terminus-font-4.46.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.46.ebuild
@@ -17,7 +17,7 @@ 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_DEPEND}
+	${PYTHON_DEPS}
 	virtual/awk
 	pcf? ( x11-apps/bdftopcf )"
 RDEPEND=""
diff --git a/media-fonts/terminus-font/terminus-font-4.47.ebuild b/media-fonts/terminus-font/terminus-font-4.47.ebuild
index 88a3b1caad35..989749e2e555 100644
--- a/media-fonts/terminus-font/terminus-font-4.47.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.47.ebuild
@@ -17,7 +17,7 @@ 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_DEPEND}
+	${PYTHON_DEPS}
 	virtual/awk
 	pcf? ( x11-apps/bdftopcf )"
 RDEPEND=""
diff --git a/media-fonts/terminus-font/terminus-font-4.48.ebuild b/media-fonts/terminus-font/terminus-font-4.48.ebuild
new file mode 100644
index 000000000000..989749e2e555
--- /dev/null
+++ b/media-fonts/terminus-font/terminus-font-4.48.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+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 ~sh ~sparc ~x86 ~x86-fbsd ~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
+}