7 files changed, 197 insertions, 0 deletions
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 0eedab8b4e36..2ce282afd192 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 6919f20aa1f4..b4908fea5339 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,5 +1,7 @@
 DIST cantarell-fonts-0.111.tar.xz 326216 BLAKE2B dad338329670674cf3815b2045f8f9a739a9e08913189cec67577982e58df8328e0dc185439bffb6bda0529846b844d0b37a3c9615210f23d47616969f7874b2 SHA512 638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e
 DIST cantarell-fonts-0.201.tar.xz 508372 BLAKE2B 5a0fcf66e9c19a54c0051b79305a6b2628a2fa5aa3f67677732ba92a4f7e1ceda0d6c05bc971b1139bb87b8c5fecf8e7a350fb521f56926c072e8a03e35d4399 SHA512 c512244a1ed343b1b9fef3a630c1c678c6ef7f06efcda883af0dbab5478823f31c9bd5fc38b92ad1747704528c6e2589584ab94743f433957644d5386dabdc98
+DIST cantarell-fonts-0.301.tar.xz 570328 BLAKE2B 2e1e235fe8986366fa2b75cfc0e5417a3e2ab4a3d237a4cc7639d56a2ae698bfe1e2e573a64d0557bcb9823428928d623cadf4f5d8c424a4516a0e44b0390659 SHA512 84bd37e9eeeb3001d336af49634184552d77df3ca780ef4cd9166925c87710575ab0208f50df2e4f0216f3b64dbe0ef5288a271866244e6cd1cd5518462f8b02
 EBUILD cantarell-0.111.ebuild 1257 BLAKE2B 0a1b39b702131c214092b0ccb1f8e5cab88aee5e1c71929203fa18a86b29d37da70ca99104ec78f141a3e2f48f3f25ee6d8be35e781e9f73e5b9e19c289e2cd7 SHA512 620544a6c62c7ab30c8da32f47b72c5308c11e67ba921967e777da1c56cece0142889cce753c0676ab42c4a8a096cc7a880f04e3d1f336730a70f720daadcc1e
 EBUILD cantarell-0.201.ebuild 1052 BLAKE2B a3e254e01939135b2d4e649af4ae069f943ad6313177b16cec740ef6dede4b9443e46757e6387c4aee5c33f7a9549b39f424e5a96fc3750e957fd0a8d6ecd30a SHA512 4d8c9b76366624c3c74933d8ece909720e049f38df61d5775b5cebfebb1fbd9f5ca8e4229026b3656f4a8cfb40cd276f774dd7fc56bcea85b487d8bf758e0529
+EBUILD cantarell-0.301.ebuild 1060 BLAKE2B 03fdc70760ececadb3f59d68750c348c24009f7f83730358a527fe214aaa2d1d21f3b3ce328dc6b2148825762fec739ec94674b60b95ab627725d2037f313b49 SHA512 36db711d502f38872cfa70157f3e46c77ba37073cd7dfe3d615391b77a80ca0b8a2c503e82520de7ec363a5e58646a8dec082cad697b5f6bc9465600b86d917c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.301.ebuild b/media-fonts/cantarell/cantarell-0.301.ebuild
new file mode 100644
index 000000000000..bb9863617adf
--- /dev/null
+++ b/media-fonts/cantarell/cantarell-0.301.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+BDEPEND="
+	>=sys-devel/gettext-0.20
+	virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+# Font eclass settings
+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
+		-Dbuildappstream=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	font_src_install
+	local DOCS=( NEWS README.md )
+	meson_src_install
+}
diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index 387bc8ae70fa..961142f4153a 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -1,6 +1,8 @@
 DIST fontawesome-5.14.0.tar.gz 11130737 BLAKE2B 0ae60cb0564ed89705d972f41084f2a3d28b630da82f055455686db5fad18709b440bf642743327369c2cc8d52b2a874a24f4a38b06d680768fa386246fb62a7 SHA512 a46679ae7758a94a4e52e0d24486aa2968d4ffa5fe0a583150847eeedc5703ad9cb47a0c71d074595ef7f44b91dae2b00abbe1c3e648447bfb5366daab99f6e3
 DIST fontawesome-5.15.1.tar.gz 11277799 BLAKE2B a1f59fe6b6f3ae93bc1a818956ae0034ba7bbb9f3ce800e5296903fa5f19426496dc21245691ac83bcb0eca5ed5aae33c0942eccb1ce8c05143a9e8509c89aae SHA512 0dfef0ae11d032bf52ecdc5ea94ad258805e61b7b4e2aedcf7b0b4d2f0977466339af54310b796eefe3115ef2cb10d1537080d2d68746379ff83cfcbea5c377f
+DIST fontawesome-5.15.2.tar.gz 11274421 BLAKE2B 14a0cb2d8f444a26d0552f14fbdd9a51c8bc7903e19cc33271618af87db744539cd7954baba4e8870aff98b3ed311aba37c3d8bbe6903065292a92561363067d SHA512 c1577b90053285a77ecf1225c1bd534fb0d3b89a4b90e4abcd37bd36ad1b35967a4746fe164ff7129c8a90f1294fab947dd2ff203a5b826ac89d5f6b48a77a80
 EBUILD fontawesome-5.14.0.ebuild 750 BLAKE2B a510e1f538fb930facbae18e60b99e9f5baedb6b1b89f0281afa2cf4d66868481e07c8eb80c288d6f87c18c0f43caa1cfcfb624fc5a43213cfaf91678711d642 SHA512 453ec352c4216b648b963ab775c2b7f4ea928230c0f80bfa5d48aba7177cdd088ddb1bcecd9741cc0b4365baca617b4bda03b1ebcb33c48d3b9fcbb8eff90613
 EBUILD fontawesome-5.15.1.ebuild 750 BLAKE2B a510e1f538fb930facbae18e60b99e9f5baedb6b1b89f0281afa2cf4d66868481e07c8eb80c288d6f87c18c0f43caa1cfcfb624fc5a43213cfaf91678711d642 SHA512 453ec352c4216b648b963ab775c2b7f4ea928230c0f80bfa5d48aba7177cdd088ddb1bcecd9741cc0b4365baca617b4bda03b1ebcb33c48d3b9fcbb8eff90613
+EBUILD fontawesome-5.15.2.ebuild 754 BLAKE2B 69e3e74b9c30206da3a3451be57a01982bd7c0ccc98ccff87c4a86eabb687719b6810bf8945ee6c56634106085f6284eb7a78ae0a5e9f51e88ae7defd9baeab8 SHA512 f1e2d758b48be58ba56f744cf0ac43fd8f1765d2f638f4f8b33a9d96ce41035dd435a99e7d2f86d7f36a2de1edd1a7cf86177be70cead9c1306e286bb5aa8148
 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.15.2.ebuild b/media-fonts/fontawesome/fontawesome-5.15.2.ebuild
new file mode 100644
index 000000000000..8301f85e2abe
--- /dev/null
+++ b/media-fonts/fontawesome/fontawesome-5.15.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 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/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index a468c2553091..92f053395377 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -5,6 +5,8 @@ AUX noto-emoji-pngquant-verbose.patch 407 BLAKE2B b737b10535b8a04ca2d17d6803fc7c
 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 2363 BLAKE2B ab125a5718b0d6c5aad920799e2a2ac25e4863cfb9543744e0491e21e9c6bc7cbffe5e0b956a2d21b1aabd0aefe24d5fe8da9bd9a2503d0d29935d772126c5ce SHA512 c0150d0c5b726b3a2bf6e523529e67a82b75982b4892c3da94d4bd8bd366fe84037f2c2b168c70481b5fce01a8c4c3fa4f8edea034079963cdfc9c2d3d33dc88
 EBUILD noto-emoji-20200916.ebuild 2584 BLAKE2B a3ab2d12d587d9970e63f01ff48d84acf59298d6d393c42aecd0382b8afde4458c346265a1ecf9d7c80ed82c2635337ea80474a2e574ccef11edfb826d15c23d SHA512 7828b9ba25794de5af53299b289c13d9ce3dd18b78ab9b296800d269afa144adc86d0b9b26076256127769d17615ebfc9e763588f7d8da930b655af3629f1397
+EBUILD noto-emoji-20201214.ebuild 2667 BLAKE2B 31d91983653f5185e43ae34d2f19b97c26711009a80ebec98f5b15a43c16cf0ee2e87854db1c769e42eced92dea7cf24634286e5e5ab33b6e6d3d062441edea8 SHA512 22bb99b0f9cfb78fdddf260c7581233f8cb1d9a9505582c84d8edcf8302fcbac44f1ae9cc2f80c93568b3bd81cf8b3e6647fb4e5b5fb566cc1e04525dedeed98
 MISC metadata.xml 331 BLAKE2B 66a5d106e581cd60216e1f288d6a7431610e92ae605ffecc3e97a3bb381cf1c29671610412d6c5c69970cac946c9653a91998d53785489d630cf9837e11a8d8c SHA512 746b080cb25302ab0d7130e666ce9b8e7682dee919affe70d18fe65e62bc878a6f30174844c9df8918eab14ecf22cc4450050d292747da032eca9ce83637943c
diff --git a/media-fonts/noto-emoji/noto-emoji-20201214.ebuild b/media-fonts/noto-emoji/noto-emoji-20201214.ebuild
new file mode 100644
index 000000000000..09c3fcc8cf43
--- /dev/null
+++ b/media-fonts/noto-emoji/noto-emoji-20201214.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..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="e7ac893b3315181f51710de3ba16704ec95e3f51"
+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
+
+	# Drop font for Windows 10
+	rm fonts/NotoColorEmoji_WindowsCompatible.ttf || die
+
+	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
+}