gentoo resync : 08.07.2021

13 files changed, 30 insertions, 374 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index e490ca212e40..0da8ea8eb075 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/iosevka/Manifest b/media-fonts/iosevka/Manifest
index 3b54d1ae6cc5..1e2798bda21a 100644
--- a/media-fonts/iosevka/Manifest
+++ b/media-fonts/iosevka/Manifest
@@ -1,6 +1,8 @@
 DIST 01-iosevka-1.14.1.zip 9725331 BLAKE2B 58f0e51ba06d27eab18336effbe825c7c7bc88f24eb457be49746f8d3b1591f2cfafb8c2a7c9b56a7528edb207cbee6741dbe394b82331c6207a4dc6886cb388 SHA512 7e1dee79d78b1bc36ff2f55140a3538802dafc22677193e0657a6649ca55d5b1de868de86ba26d9458a3afe481298356dcf641afa72ecea2d69adb6382a5fd58
 DIST 02-iosevka-term-1.14.1.zip 9672957 BLAKE2B b03751969722919b4c4172b066f372f334f45f38636cff8cba764a5c30d906ab000887c290b4583f418307c2efea7c3650f5557d535b1e7c26c2078ee29ebcb6 SHA512 6b17960b960365a81ba78a68b6ad04c6146f51855f0f6abc288c12d8dd50669fe245f94aa135b032df14d0ec7bc6b291aef1c8a86ccbf948b8e5678862febe34
 DIST super-ttc-iosevka-6.1.3.zip 49284897 BLAKE2B e39a99b7969f3a8871328a61581ecbb01fba4bcd114075d11a9b0e0be958fef00c14ac18ffc4da46849f23ebbd54f9cf96969609d69e3f5eaeed94bc632b26f0 SHA512 54be6b4f5b1d3a56a9eb3fc9791cd91d53c5f02344f7dd1eccefc4e8036fc59b564af7673afe131598d949350c865f0d809052b3a34e14f2519f760aa36f3edb
+DIST super-ttc-iosevka-7.0.4.zip 88522748 BLAKE2B b5cf921122a3b419df52c7188c5114b0f0337c58496759da2ec70cfb735ec1fab9cba4f0336b5bfbe6af4b58307e17ea08db120a58f13214d158cc65376990a3 SHA512 a1e0cfd0ad641b01f566423d23010a737720a88ec91c7cf5da74888f3776a0963fb1e40a8d94b9cbed3dd42dbf67d84fb979b092896e9cc2f477a73ee631843f
 EBUILD iosevka-1.14.1.ebuild 529 BLAKE2B 721eccec336335f31d8a2c8ca355502bc2278e59707b8ec76fd556f869f662e6459f1c65ccbd175c2dc64cebd979f8582e37dd9f6e55d6bf54f8712ad3c8d8bc SHA512 409ca2192ef4080ea4992eb1eb4348513d940fd52ad00bc936f76a64b70ee8561198563dd1889ec97746f560e1260005abf20eea503f7834a38424737c5d851d
 EBUILD iosevka-6.1.3.ebuild 458 BLAKE2B 4afbbc61ca18bd6d6d78f111abe5d403e70e049fd76bdd65b540f04252663f2b174b72f6f90d569c470c87100835fa3eb1d4c1ad645948f6d05448b714502548 SHA512 ef98d72062b77a9f74123be3b1543c363b0415605807575b1b992bd5f72bb8581979a5d580f9d5075c55162b32e04ed81d94ee594c297b7c98ceb13ff6aec3fa
+EBUILD iosevka-7.0.4.ebuild 459 BLAKE2B fb6969aecf09bb6dc8800fe1a7a733325af7fbfc95470ead9fae6433cdeff2cc43b96ff674c1d0ba8ad12e68874111ef6b5752c6d3c343239fa7a59a75e064c1 SHA512 c9e50e42765306554021616f0186a8249e7dcf02bc287c0cd8a154405299d739a602dd3516bf5fbe913dba1e671092b1bd4d296a3c340fce053c80495f0eb5ea
 MISC metadata.xml 469 BLAKE2B 38c7ab001c908ddf66cb9fa95e5f418fe387c88e4eb56088b83b10297461d7ff77ecc2c6b15de30dd9a6504943aa02c5727b1212e28d042dbabc9f75eab24d01 SHA512 26acd6f42e9e5a04a4dbe4ab8eec5f323de7105474b5bcd0d97afd02363911c0981047ea4c28564c0aef35af2186a86b836b1e34eb0e22044e3e7079e9065645
diff --git a/media-fonts/iosevka/iosevka-7.0.4.ebuild b/media-fonts/iosevka/iosevka-7.0.4.ebuild
new file mode 100644
index 000000000000..38b5f11e5036
--- /dev/null
+++ b/media-fonts/iosevka/iosevka-7.0.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="Slender typeface for code, from code"
+HOMEPAGE="https://be5invis.github.io/Iosevka/"
+SRC_URI="https://github.com/be5invis/Iosevka/releases/download/v${PV}/super-ttc-${P}.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+FONT_S="${S}"
+FONT_SUFFIX="ttc"
diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index 09f0b0c0688f..e840958dfc13 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -2,11 +2,6 @@ AUX noto-emoji-20180823-build-path.patch 313 BLAKE2B c7a6a67639444329f033da14b58
 AUX noto-emoji-20190328-use-gm.patch 1169 BLAKE2B 6659f1f80ec3f44942a7b96b23f5ae90ad9167cd30812e6fc71abe3df3179184b2be389ee8f277a4ce696269ffba2e25e8c024677b73c925b7ad06cdebc5846b SHA512 e3c1d68bd887c8e9dd7e752f946cff8265c996cbfafe27652ca90e67bb555433787edd45a5805bbca5b73b15377c5102593f594bbe2777d2c07452143b164c5e
 AUX noto-emoji-build-all-flags.patch 336 BLAKE2B b6c10010f9fe3b1e62ce436bbd0fae6ac85bd8feb2776d2d731a9b155818b828b7ecc1ec58861976b890eb1faf4db59bead3e86e7c39e44113b11152347cba29 SHA512 0d67afa05081da93cf05827dde54cbb6ce593e79874e823680d1c521c0953c49d4dcf12135da43b74bc72b4a79e8b7b0123ae2b2cd631f040c6797e04d3f008a
 AUX noto-emoji-pngquant-verbose.patch 407 BLAKE2B b737b10535b8a04ca2d17d6803fc7c6a36e733acf88a6089b56004f9d2a265851278cbb85b6a5d2c2ab18e46f12fcf84d7185e768cae2e3eafefeb3bc06869e5 SHA512 5bcb05c6b7a1e0970e1ff67707a1a5d49b22ada4ef4677d3bb9f9874e045d79f1d35419abc80b39bec81512f547360eb705dffeb421c48296a9646c618f75f61
-AUX noto-emoji-zopflipng-verbose.patch 299 BLAKE2B ba5f18515ae77b8c5228f2ecdc0488a221bd0e44e1b91368fdaadd3318937a593790aa597ce554758c7197e9e28f874cd5b16fbc0782a55d1ffcff84ec1ab3d5 SHA512 fe83ace875d980c9c04845e10cb405e73223f3464c50607002526793acd46f885ba8ffe4fba66e1f408f2fba365478052b01063ea56ffbca8e90c2073e3bf6b6
-DIST noto-emoji-20200317.tar.gz 60841240 BLAKE2B aab99a5cbab6943b9e282b33dc113601489c7d02a3670db8675e6c90be615ceaf0f2900bdbc68ffaca6130f4e724b2ec1001cfccce80a181208ace0638492b7e SHA512 958a589ef7d7a0b9e4fa3eb1caa20284fa7463419a740d0ca05f850618324883c13498f92839476042cfd1daffa7eff925b2f22ec318c0726391f69c04911bfb
-DIST noto-emoji-20200916.tar.gz 60016327 BLAKE2B 980a4e960f200567e34c1314d9269029749e1d9cd29ab1c5da30418d8a016b894223adf8f263222512c513feab4de856a2f48b1695011ced0c49c30e7a487e47 SHA512 d497c4ecaf299ade23b1f6a3bc6e98d7dbbb619e51f067496d4a4dbf71693c96de26263af595c0aae86c63dcea8be190718f5477af645d4338989f25cc3ab848
 DIST noto-emoji-20201214.tar.gz 69885567 BLAKE2B 21d251a25740bf474e4c7e138c33d90f35cfea93ff2c72904e38a8bead0124408c67a731ed142fe96da07bbf8afb7d929293518a366157fd1393dacc560bf12b SHA512 b3ad1f31bbb48bd5de2fbddcac5c3f27891a805ae4ac8d0b69b07c1d7259c6a5317eca9ac7e3b068d24ed5d3acd3523cfb2036f2e9f08179b85fd81dd5c9b570
-EBUILD noto-emoji-20200317-r1.ebuild 2361 BLAKE2B 8712ff4e257c4ebd7605a2b44b135543e7effeab8dc8025c56eb192e2b392488578474af53646d19523326e3aeb72bfe3cd86f48ac287346f8ff236daeff98c7 SHA512 81cd61156918b2604824a5da6126b8517cd05978a3b4d15b945a6590aba10a9ff696644d240b3e4e82350a241c63be6cfe8a593f9b5a75e6a58e41ac5fde3aa8
-EBUILD noto-emoji-20200916.ebuild 2584 BLAKE2B d15f6941e0bbcec3249fd0ae6d69ddb05f232aad406867f8e22f659bfaf6260c618b8579b222d97f2f006ea2d12d920d49347bbea2448dede64c7bf51028983c SHA512 7b76ebe42a832df2ea4a594391f315b0dbb36aa3ca7b6ea40ed39f84111f7222f44f1f43574f67ec626eb03f3daeddb19a1576794d3f71e55ec6e005c96d12c0
 EBUILD noto-emoji-20201214.ebuild 2664 BLAKE2B ff8686ce532ce325ae93ecd32e8555b254e49203fc125ec515421cb2eb798547a4eddc43974109a2b9750099b0fc502ed0409a34b0149e5e5854ccb7a56f1806 SHA512 d0d59ecb4e2184b3e3fbb04a465ec7d702c9b1af26ef58d0bdf221d1b73e55dc4b16eff610e2096cce75d362bfe594f4e26f539b0dc6095523936d9932ed3f12
 MISC metadata.xml 331 BLAKE2B 66a5d106e581cd60216e1f288d6a7431610e92ae605ffecc3e97a3bb381cf1c29671610412d6c5c69970cac946c9653a91998d53785489d630cf9837e11a8d8c SHA512 746b080cb25302ab0d7130e666ce9b8e7682dee919affe70d18fe65e62bc878a6f30174844c9df8918eab14ecf22cc4450050d292747da032eca9ce83637943c
diff --git a/media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch b/media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch
deleted file mode 100644
index 0cb272994aa2..000000000000
--- a/media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile~	2020-04-22 23:07:33.000000000 +0200
-+++ b/Makefile	2020-04-22 23:11:46.356767595 +0200
-@@ -194,7 +194,7 @@
- ifdef MISSING_ZOPFLI
- 	@$(OPTIPNG) -quiet -o7 -clobber -force -out "$@" "$<"
- else
--	@$(ZOPFLIPNG) -y "$<" "$@" 1> /dev/null 2>&1
-+	@$(ZOPFLIPNG) -y "$<" "$@" 2>&1
- endif
- 
- 
diff --git a/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild b/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
deleted file mode 100644
index 84b1ddb07132..000000000000
--- a/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit font python-any-r1
-
-DESCRIPTION="Google Noto Emoji fonts"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji"
-
-COMMIT="ac1703e9d7feebbf5443a986e08332b1e1c5afcf"
-SRC_URI="https://github.com/googlefonts/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="buildfont"
-
-BDEPEND="
-	buildfont? (
-		${PYTHON_DEPS}
-		app-arch/zopfli
-		$(python_gen_any_dep '
-			dev-python/fonttools[${PYTHON_USEDEP}]
-			dev-python/nototools[${PYTHON_USEDEP}]
-		')
-		media-gfx/pngquant
-		x11-libs/cairo
-		|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
-	)
-"
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-python_check_deps() {
-	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	font_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if use buildfont; then
-		# From Fedora
-		eapply "${FILESDIR}/${PN}-build-all-flags.patch"
-
-		# https://github.com/googlei18n/noto-emoji/issues/240
-		eapply "${FILESDIR}/${PN}-20180823-build-path.patch"
-
-		# Be more verbose, bug #717654
-		eapply "${FILESDIR}"/${PN}-pngquant-verbose.patch
-		eapply "${FILESDIR}"/${PN}-zopflipng-verbose.patch
-
-		# Based on Fedora patch to allow graphicsmagick usage
-		if has_version -b media-gfx/graphicsmagick; then
-			eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
-		fi
-	fi
-}
-
-src_compile() {
-	if ! use buildfont; then
-		einfo "Installing pre-built fonts provided by upstream."
-		einfo "They could be not fully updated or miss some items."
-		einfo "To build fonts based on latest images enable 'buildfont'"
-		einfo "USE (that will require more time and resources too)."
-	else
-		python_setup
-		einfo "Building fonts..."
-		default
-	fi
-}
-
-src_install() {
-	if ! use buildfont; then
-		FONT_S="${S}/fonts"
-	else
-		mv -i fonts/NotoEmoji-Regular.ttf "${S}" || die
-		# Built font and Regular font
-		FONT_S="${S}"
-
-		# Don't lose fancy emoji icons
-		insinto /usr/share/icons/"${PN}"/128x128/emotes/
-		doins png/128/*.png
-
-		insinto /usr/share/icons/"${PN}"/scalable/emotes/
-		doins svg/*.svg
-	fi
-
-	FONT_SUFFIX="ttf"
-	font_src_install
-
-	dodoc README.md
-}
diff --git a/media-fonts/noto-emoji/noto-emoji-20200916.ebuild b/media-fonts/noto-emoji/noto-emoji-20200916.ebuild
deleted file mode 100644
index 3e3fc27ca1e5..000000000000
--- a/media-fonts/noto-emoji/noto-emoji-20200916.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit font python-any-r1
-
-DESCRIPTION="Google Noto Emoji fonts"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji"
-
-COMMIT="aac7ccaa4d1dea4543453b96f7d6fc47066a57ff"
-SRC_URI="https://github.com/googlefonts/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="buildfont"
-
-BDEPEND="
-	buildfont? (
-		${PYTHON_DEPS}
-		app-arch/zopfli
-		$(python_gen_any_dep '
-			>=dev-python/fonttools-4.7.0[${PYTHON_USEDEP}]
-			>=dev-python/nototools-0.2.13[${PYTHON_USEDEP}]
-		')
-		media-gfx/pngquant
-		x11-libs/cairo
-		|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
-	)
-"
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-python_check_deps() {
-	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	font_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if use buildfont; then
-		# From Fedora
-		eapply "${FILESDIR}/${PN}-build-all-flags.patch"
-
-		# https://github.com/googlei18n/noto-emoji/issues/240
-		eapply "${FILESDIR}/${PN}-20180823-build-path.patch"
-
-		# Be more verbose, bug #717654
-		eapply "${FILESDIR}"/${PN}-pngquant-verbose.patch
-		sed -i -e 's:@$(ZOPFLIPNG) -y "$<" "$@" 1> /dev/null 2>&1:@$(ZOPFLIPNG) -y "$<" "$@":g' Makefile || die
-
-		# Based on Fedora patch to allow graphicsmagick usage
-		if has_version -b media-gfx/graphicsmagick; then
-			eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
-		fi
-	fi
-}
-
-src_compile() {
-	if ! use buildfont; then
-		einfo "Installing pre-built fonts provided by upstream."
-		einfo "They could be not fully updated or miss some items."
-		einfo "To build fonts based on latest images enable 'buildfont'"
-		einfo "USE (that will require more time and resources too)."
-	else
-		python_setup
-		einfo "Building fonts..."
-
-		# From Debian:
-		# The build requires a VIRTUAL_ENV variable and sequence check isn't working
-		VIRTUAL_ENV=true \
-		BYPASS_SEQUENCE_CHECK=true \
-		default
-	fi
-}
-
-src_install() {
-	if ! use buildfont; then
-		FONT_S="${S}/fonts"
-	else
-		mv -i fonts/NotoEmoji-Regular.ttf "${S}" || die
-		# Built font and Regular font
-		FONT_S="${S}"
-
-		# Don't lose fancy emoji icons
-		insinto /usr/share/icons/"${PN}"/128x128/emotes/
-		doins png/128/*.png
-
-		insinto /usr/share/icons/"${PN}"/scalable/emotes/
-		doins svg/*.svg
-	fi
-
-	FONT_SUFFIX="ttf"
-	font_src_install
-
-	dodoc README.md
-}
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index 889c4dc0932b..d5d64f4e2f2e 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -1,8 +1,6 @@
 AUX 66-noto-mono.conf 326 BLAKE2B 5bf5d20d31635e0b84f34d9a619df0de842431d319c283d120bdc060766ee4f2073b485c267206905c4e8095c40a176237c17c315c9a1af5771591ea636c1673 SHA512 91b71d5ee435bf1ee534be6b4461d93b1f57693137d929dc2ca98f4074754ace4ae6e8f05e627af903332c8a63449ab40eebea7a385ec27580fa2a782a3a8fc7
 AUX 66-noto-sans.conf 318 BLAKE2B 42a6036c93c982b2b0eb04a530dafe6d8eceeac0e770411d8dedda2e6ae62a921642f23db1f0849d6d08295ebe44f1b204fd93a27661e3f5ca52e5c6f8bd76cc SHA512 80c15846c014c723830aefb84c6d3069f9addffd1ca227a8a7b17023c64a949254152541f7e81b4afeca690ddeab959f35f390366f7e697e3b7715d692ea7c98
 AUX 66-noto-serif.conf 310 BLAKE2B 804753d2e703ce309e74da15aefdac6d510f52396a312a143c1a9e0e499f0301e5a154f6df48cf4a71834c637b1545953354d0c3518d67a429850135ed2db4da SHA512 c0ade988e2560191098c539de4341dfee29bc67d177f5916c7eb3346586c19c791c32842016db334c3d3689d89a1437220544f2c45934a9c0d74d2f6064aaa69
-DIST noto-20200521.tar.gz 861394318 BLAKE2B e30f7ec58130786414f2dd33acaf9c75f403718612270e346fe51df0cb74088ddc34b699d4af9a494446940aa58a4c2cd043f46208aa7a3004a194703efb464a SHA512 d1090eae56c74237da4e35989d3518dfcb163deee1eb4df64a6be0ccb7e6f2a2207f0602ee5f0156efa2bdb3d105073d2e9a65c8841dbab34207c89c05aeb8bc
 DIST noto-20201226.tar.gz 903613276 BLAKE2B b6ae0357a854b775ca43768609775624370d2f13ae65d05e699105cfacff4bb919ca19f757d4f2fbfde2d24fdfe6c5d6d3b5993a071b0d081948ef8ed6c5eb76 SHA512 240ae214729388e7000a4e12a1fc81b0b562ca6f3fcb4fcdef66a27c1b193825fbf2d0fd4cc8fbae4cd17f57e21fd1589150cb02b7b618d670742692b748f9ff
-EBUILD noto-20200521.ebuild 1383 BLAKE2B fd4a16466e669785442414f634a05ae060cf42f9fbbb5cf9e791ece64f14bc4fc23c629891f7379012fc91f79cbeabde9c818c1889d64134ce92fb1bd7a75a8c SHA512 f08ca325dd93bec505da040743caf5b4d89d0d9109b823ee0c3ec0495d5fe780a4707a146b8f933becc3b3e486d91e041ec3a1518659e9a48ecaa46484daaca9
 EBUILD noto-20201226.ebuild 1414 BLAKE2B 6d218a53f46c293c61ed5d4600a5dbd1d73f28de4c5efef316fa531585dea1e57924acd519d23c934a48b41b376dbc292646d96b91da3c13c9a3ad33a1234c81 SHA512 01ad9189633fdfe528aff1ce1b96d31870fca7908f98e77b8b06f52fe4e5ef845cfed2c4ce7edc01d5e5f42c3ad9671605bbff44079d96a90f3f0f0ed259210d
 MISC metadata.xml 416 BLAKE2B 28cd8161f664af29200d53d74d4d6c63c5d6921861750282317cf57c4654e66f72a69404f2ba2255739a325ec395da5d1483fe2b230ed3084431cd376ec94b38 SHA512 aa7174f866d3b68832c9915a2b14e3fd1731aca07a2aaf7b26d7b20f439c19f498ded395126a0ca50352694b5a2920cd370304fa45a7135704de8c4b9651e0eb
diff --git a/media-fonts/noto/noto-20200521.ebuild b/media-fonts/noto/noto-20200521.ebuild
deleted file mode 100644
index e79ab7e85952..000000000000
--- a/media-fonts/noto/noto-20200521.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit font
-
-DESCRIPTION="Google's font family that aims to support all the world's languages"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts"
-
-COMMIT="49313785484cd4d1f4c0329ee3a8801f158f5ba1"
-SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86"
-# Extra allows to optionally reduce disk usage even returning to tofu
-# issue as described in https://www.google.com/get/noto/
-IUSE="cjk +extra"
-
-RDEPEND="cjk? ( media-fonts/noto-cjk )"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-fonts-${COMMIT}"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=(
-	# From ArchLinux
-	"${FILESDIR}/66-noto-serif.conf"
-	"${FILESDIR}/66-noto-mono.conf"
-	"${FILESDIR}/66-noto-sans.conf"
-)
-
-src_install() {
-	mkdir install-unhinted install-hinted || die
-	mv unhinted/*/* install-unhinted/. ||  die
-	mv hinted/*/* install-hinted/. || die
-
-	FONT_S="${S}/install-unhinted/" font_src_install
-	FONT_S="${S}/install-hinted/" font_src_install
-
-	# Allow to drop some fonts optionally for people that want to save
-	# disk space. Following ArchLinux options.
-	use extra || rm -rf "${ED}"/usr/share/fonts/noto/Noto*{Condensed,SemiBold,Extra}*.ttf
-}
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 6b7131224976..55352814bdaf 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,5 +1,3 @@
 DIST terminus-font-4.49.1.tar.gz 648345 BLAKE2B 8c2edff7e57572361cf9a4907a165f8af69cbd5a3ae15817d02d43ab5134278ab64b269e6bd8c79d2107e5c8c51b58f07ab45c308891464cbc8e3e15767efadb SHA512 2e3a99960c459a453b5879bebbebeb653f0a22060177bf75c67bbeb7d32cfe1acce9e74a88fdc42e299b6dc402e0708552487abd26e80e985c7d6059b0d445a8
-DIST terminus-font-4.49.tar.gz 648477 BLAKE2B 67bddaae88b7411381bce5e8fe5c1b0dab334a33f1371a33038556beffa779afec8706f27b156e5660bfab5b8b7aeda75267c68945e1be3b41dbea7e9345f164 SHA512 27d396e7fe399728b5e9228c901922588eab0b344ea438fcf98f18f80ce816d838a42d5a3da0b5644d895747bcbda0e30bb8dabf342c0439d1f6b51f7acf8496
-EBUILD terminus-font-4.49.1.ebuild 2722 BLAKE2B 77655c67ffb24927e56afc3faa5968f22e5f91a8b5b287968aad08ade1df6c30105293a37b956b38ebc53aebecf88997051fdcf56944fd2119eec299880d865d SHA512 c49c0b21aa5ef18083d7447f04bc5b603a0a59180659de1b7a9267bc8ad65ca6793cf6f1353414c5be0e0253b4aa67bcd1577507e4fbc9fd783c691e3425603d
-EBUILD terminus-font-4.49.ebuild 2692 BLAKE2B e4c34d0d5ce30238b52837946b5c6279efe0a54597dbd531914b8cfa343b0fb32654368fe52b4dcee8e83182267ca240bcb9669f53fbfd83536bb469c5c3a12d SHA512 fcf8edfd26105d8c4e0037b9f8b32031d1e3cbe25e8ef99d2e03c7b36d3cddf8a53236bbb27ebc894241cd9184b9516f46317f3119559a824c7c66d4aae1b5c2
-MISC metadata.xml 1900 BLAKE2B fd9959aeb2c59a0c96453e37f39efeab0e3a35af8bc4335c9373df175c4e502656d7a31e9c091814b32c69a4c83c088c1754149debe7432a27247ea3b877ec9b SHA512 d8ac7b4f8ec5a24e525aec0ff6268704e33b56c4e50e0bb1734b8d135aad4bc00572a288f405721114eeddbe963ac87ca9c06de02026520e05d38830713e3d44
+EBUILD terminus-font-4.49.1.ebuild 2725 BLAKE2B 9bfdf6b6888fc1f1cb35551b03d1136b76743cf36a59d4daa1ef9dc38db250cbac572a8c99542baf6a202f5f825b3c157d2c234ca78b3e14b353c80f5aa27773 SHA512 fc6dbe24f63f683734ea36cd80108599e2ba51087fd396c2c10011539539d5a4becfc80f5f0c493add1ac68d111885025117c9c3cb8e8f64a738f864cebd426b
+MISC metadata.xml 1925 BLAKE2B d80e4a334efca11b8446d575026f1cb8ae828a8fc809e9d10d82af6048f8a09ae46cb6d95b41179708c9b5179c7fc0f7e162cf852f2c5ef6fe7bd58e2d3cb90d SHA512 9279bbd00606410c1f36c00a69f3f226da3be9f3a14165d2e56ed4b8e315ba6c7d9c720731029c0899b0bd2c357465ca5ebdcc0eb4a11456fb89d3fc900c01d3
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index 3c5accf8462c..ba130008fda5 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -13,6 +13,7 @@
     <email>slashbeast@gentoo.org</email>
     <name>Piotr Karbowski</name>
   </maintainer>
+  <stabilize-allarches/>
   <use>
     <flag name="a-like-o">
       Changes view of letter 'a' - a looks like o (see homepage)
@@ -24,7 +25,7 @@
       Install Open Type Font (OTF) (required for HarfBuzz backend)
     </flag>
     <flag name="pcf">
-      Install Portable Compiled Font (PCF) (required for X11)
+      Install Portable Compiled Font (PCF) (X11 bitmap fonts)
     </flag>
     <flag name="psf">
       Install PC Screen Font (PSF) with unicode data (for linux console)
diff --git a/media-fonts/terminus-font/terminus-font-4.49.1.ebuild b/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
index 04fed52ebaeb..7fbe98e86d71 100644
--- a/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit font python-any-r1
 
 DESCRIPTION="A clean fixed font for the console and X11"
@@ -12,11 +12,11 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-$(ver_cut 1-2)/${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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 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
+BDEPEND="app-arch/gzip
 	${PYTHON_DEPS}
 	virtual/awk
 	pcf? ( x11-apps/bdftopcf )"
@@ -26,7 +26,7 @@ FONTDIR=/usr/share/fonts/terminus
 FONT_CONF=( 75-yes-terminus.conf )
 DOCS=( README README-BG AUTHORS CHANGES )
 
-REQUIRED_USE="X? ( pcf )"
+REQUIRED_USE="X? ( || ( otf pcf ) )"
 
 pkg_setup() {
 	python_setup
diff --git a/media-fonts/terminus-font/terminus-font-4.49.ebuild b/media-fonts/terminus-font/terminus-font-4.49.ebuild
deleted file mode 100644
index 7f8326f79edb..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.49.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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"
-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
-	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' '')
-		$(usex otf otb '')
-	)
-	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
-}
-
-src_install() {
-	local args=(
-		$(usex psf 'install-psf install-psf-vgaw install-psf-ref' '')
-		$(usex pcf 'install-pcf' '')
-		$(usex otf 'install-otb' '')
-	)
-	# 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
-
-	use otf && FONT_SUFFIX=otb
-	font_src_install
-
-	einstalldocs
-}