gentoo resync : 04.05.2021

9 files changed, 43 insertions, 11 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index b7600de9e73c..7e87980d9af0 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/droid/Manifest b/media-fonts/droid/Manifest
index 224f83b0c678..5aad15322272 100644
--- a/media-fonts/droid/Manifest
+++ b/media-fonts/droid/Manifest
@@ -4,5 +4,5 @@ AUX 59-google-droid-serif.conf 329 BLAKE2B 4d7042c7eaefcbaa8ba29650b541d613a899e
 DIST DroidSansMonoDotted-112_p1.ttf.bz2 74649 BLAKE2B 07124449926ae09babf6d298b8d180f4309580608614228257230348b2207ae565e6c1cc40b9b85d233a396a72c8db4ad8f9694a4807b95902a20e5fc055d6b1 SHA512 420cf24d3585d1f7b8a81f81e743ec415344b365f1f80447f43e384df39b9825926efd8762bc7864c3c3363e4054b8bc8f8f78871b6a23074994a869da911fdf
 DIST DroidSansMonoSlashed-112_p1.ttf.bz2 74632 BLAKE2B e699ae9170d91a980fe295fcc22a8efdd499381447fcde3e2403c6c63f50e3579f71507d8df744077ea8131446c1668d344838bb38d049c8c15e2d9926907bdc SHA512 bd6031600631fcd51c72232c6a2b42230274b3445b658a2299f4d87613e3a97775b08d10b4a1ad0f3758a5b927593bff0dac6ebb3768d6e44e32c047d858878c
 DIST droid-113-r1.tar.bz2 4227725 BLAKE2B 9b9c25b93c5b4b9335589af02e6844d52a5a01d37b168b117f0191793b5274e8d4c944dd15a949c4ad868d8c2e51412ec875e72fc642b388d4018e6bfadb9248 SHA512 1219f54bb153b26bf460d89d866236a4f4ae9010eaf0c1236a9d9633dea7808df7228c6cffcf9635fcfeaa81e5f93e8ece7b02b885a5e9baddc9f522ee07ac64
-EBUILD droid-113-r5.ebuild 1127 BLAKE2B 68ee88e88b4062388808ffcd98d75f18587f930a78e326a61e14bfb85f0208c1ac9fbe710155954fd6838eb561b2c98aacac0b108bbe2f4868265eb48e2d8988 SHA512 c830e301257237b5a1f028f592641a21a04c4bafcda7145384b17f7101001c36fdd42c9d6da6dfea5f18bfe6d49128768350d5753f8f43ec10ee9f0fe21a7c01
+EBUILD droid-113-r5.ebuild 1129 BLAKE2B 92bd5ea310e2d191b802d01f58a85600aa704667e7392d9a20847eeb448cd17b8b33b167ff29d9908ac744dc8b268f5e87f72996a5adc13d4fbe71766a445f4d SHA512 6062693e59a9d52213b56400aee40de40a87306537d996601559f6ccaebac31dca0364d0ba27436c0d5f2f9648754efc0097217c8d02ed5ac481e32479218167
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/droid/droid-113-r5.ebuild b/media-fonts/droid/droid-113-r5.ebuild
index 06a2a1d627c4..4883bcdd608e 100644
--- a/media-fonts/droid/droid-113-r5.ebuild
+++ b/media-fonts/droid/droid-113-r5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="${PN/d/D}"
 inherit font
 
-# $PV is a build number, use fontforge to find it out. 113 was taken from:
+# ${PV} is a build number, use fontforge to find it out. 113 was taken from:
 # https://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts;hb=HEAD
 DESCRIPTION="Font family from Google's Android project"
 HOMEPAGE="https://www.cosmix.org/software/#Drois%20Sans%20Mono%20%28Slashed%20Zero%29"
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index 8bff33142f53..8ae89943d5ce 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,3 +1,3 @@
 DIST font-util-1.3.2.tar.bz2 158480 BLAKE2B 490aa54fdbf0e7060a17261e6ac06d30ef374c0ef40ae7473680c192898305c86617667c59f334d54e3ba3eb2464e925a12a5ad4bc74c73f6a62b0500d7c0da0 SHA512 7cac529b12ae71185b89c72c1569b9826f52eeaecc1c76010338e7c42c4078ae339f18220b580bbd68fb5dc09df6ecf169a47c32e6104d8ee53bd443fa21d167
-EBUILD font-util-1.3.2-r1.ebuild 683 BLAKE2B 6ff833192927c44c14446704541e34363879c56cffb6c69e61fbb14c9b80da644cfdb81979c25f0c1c2bb6d3f687b5997ecb82a246b91ae2edbe631eaa202323 SHA512 f7447bc5041db31836b08e7ec50ad860d30c47c774b10666a96260e6ebe420a501c70736722835adaafe887c2a7496f21fc945bd19def40acf9ea13c07772d89
+EBUILD font-util-1.3.2-r1.ebuild 644 BLAKE2B 64f12f3e2ae9a7deb5bee162a73367bf0728f4f77e7ed05beced56f347cb3117b7565e0dddb2d7fd32592e466c4d0f6916bac958827301c63546708fd590b559 SHA512 f36dfc294510af5603382a9d0548ad51eebea91c354f20af0be04e9cb81c0151e46345a6434adbb78655d288eb82ce27a689f8033f4aa275c5a7b5953b852f91
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-util/font-util-1.3.2-r1.ebuild b/media-fonts/font-util/font-util-1.3.2-r1.ebuild
index ad6cf7ca5cef..653878effa50 100644
--- a/media-fonts/font-util/font-util-1.3.2-r1.ebuild
+++ b/media-fonts/font-util/font-util-1.3.2-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit xorg-3
 
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
@@ -9,12 +10,8 @@ DESCRIPTION="X.Org font utilities"
 HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/util"
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
 
 XORG_CONFIGURE_OPTIONS=(
-	--with-fontrootdir="${EPREFIX}/usr/share/fonts"
-	--with-mapdir="${EPREFIX}/usr/share/fonts/util"
+	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+	--with-mapdir="${EPREFIX}"/usr/share/fonts/util
 )
diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index 5ddbc03e96cf..dc7cb167ca71 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -1,8 +1,10 @@
 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
+DIST fontawesome-5.15.3.tar.gz 11240429 BLAKE2B a6de9a8add03e12e569ecc45c4b1fcefddb5f146f74aaeca8359fb97012648f9a11beffc34977be49e45747f7e43a1d084400aa9ba76006ef84bcbca1ecf214e SHA512 f540d8828eff91636b7e701455062d28be58fcecfd842919f4f95f1035f6d23d9b64f3f5ac24bda08be507f8d7cd0943aef8577321c37765951d88d6d6c60fc7
 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-5.15.3.ebuild 754 BLAKE2B 69e3e74b9c30206da3a3451be57a01982bd7c0ccc98ccff87c4a86eabb687719b6810bf8945ee6c56634106085f6284eb7a78ae0a5e9f51e88ae7defd9baeab8 SHA512 f1e2d758b48be58ba56f744cf0ac43fd8f1765d2f638f4f8b33a9d96ce41035dd435a99e7d2f86d7f36a2de1edd1a7cf86177be70cead9c1306e286bb5aa8148
 EBUILD fontawesome-9999.ebuild 754 BLAKE2B 8139cd34cc29526704c92f777f7778f1d5a1bca619479c68f9de347478eaad7dd69f2a3c468b212ead81c82f4f6fb76f9a4553d94b357f647fdba553c8f2ce6d SHA512 8b3c9eb248460a0b0a2a507af8cc7cfd372b3f15da80400d54c148aa581b4bb6d7cb68706a1a33cc6091af367b330c32ab8d6323451bb7f09245cd135b793469
 MISC metadata.xml 562 BLAKE2B ffd93846055a9550e8146f9bd31e50f27822f7c2220ee0d8f059d9a7661b6fca8e7ef25d901fac389c1aa51de7939470fd1314e76640331c75263c65bb3bd76e SHA512 36e019943cd70848f6f62f0540e7b5b579e95c1ccc190abc3c1ed8418d3a0febdebbedc1a6efebcbf9220b0cc5aaa6c863f4e4d92047767bb6164bec7b6793a5
diff --git a/media-fonts/fontawesome/fontawesome-5.15.3.ebuild b/media-fonts/fontawesome/fontawesome-5.15.3.ebuild
new file mode 100644
index 000000000000..8301f85e2abe
--- /dev/null
+++ b/media-fonts/fontawesome/fontawesome-5.15.3.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/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index 460295f11bec..3b2b05e547f2 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -4,5 +4,5 @@ DIST liberation-fonts-2.1.3.tar.gz 4977444 BLAKE2B 1d77ea6a9aa850a3501a7051bf3e3
 DIST liberation-fonts-ttf-2.1.2.tar.gz 2370416 BLAKE2B 386eab6e886b677082bbbe1bf625bf91304e6baa4352a8dba3d073d3d2d80c1ae85ebb456f0b967be7ba9c430d7a95364107e54e789d419605976174ceb751b3 SHA512 bfdc3fb7dff1e78aa833035dad40bc26b12bce24b9e16863ec2f8f768a2a370705fafd25c430e3ed4ba7f742051c52ed3cf14da82a8500797b9efcdeef507f3c
 DIST liberation-fonts-ttf-2.1.3.tar.gz 2370443 BLAKE2B af9039d7586e87b25b05ee80893fb63f0857c05de748a9a9228557556d74cd322c8411672387f6a55b4e6ae2e7c16adb00b6e4d19b6170ce822721845741d0bf SHA512 d988cf02119352f7815327e58ac93ffc2301da66b9afe4427b49ed01edd465dbefd05bf76936035f501d9d38636e97cf243ba87e9f62ca85599ad2c9874a2c77
 EBUILD liberation-fonts-2.1.2.ebuild 1267 BLAKE2B f60735a91a98b46366b8b741e18e0602994c9630feee641309e8c8d4bd7100de07109d3b7b5ec0f84cbf18a767ef3e18c77d640c5931b2153c482275027fc1db SHA512 fe42c6bebcc1c3aa988cbb42c97802cbd5c8ca0ab8beb0fd9dd14a26e3598b907416434e54c1b3fa1d1090827096a341b63457bcb83123cf14b5c4968baf8f36
-EBUILD liberation-fonts-2.1.3.ebuild 1273 BLAKE2B 236d8dc19cedd23307e82b8b94f91b2ddbff471ab8f0a62295e2b425802e9f30f6f6bd7a2a2713e322c2861dddae42a9be6c0f05ed284e9f486b960db61d58ad SHA512 0636f745d6d454480e37aa9c0e85e2b2b874a374b8f8515662cb0b55f652a9bb81a88b4274abe9863ffca5a261356aa28f3bad977c24994f399f925077698e1a
+EBUILD liberation-fonts-2.1.3.ebuild 1268 BLAKE2B 89544e099f37f9065a265f9022f0cf3d0c43212c5292182d705a02b3ae41a796a462c66ba21a3ead9bd8ae8b17ed123a9c8d3266765956dfed8da028481bd60f SHA512 de277550dbd9157833d406639f9615c1ebdc78fa785127386f6b4099a44e7e64cf9769dec09fdaff08ee71c860c23f15379f382f60d6cf49f59032d517b876f2
 MISC metadata.xml 347 BLAKE2B d87f084f711672ea5d33cdae481ac57f5359a87daa9dc6b27267d227e85a935abbb7abbeec64f3610c2aa758d59c46ad4d62f5f3cf90480c0a385a270b099f9c SHA512 e6b5b7a4374456a468c2a42536858ad64ef12b0156623685370350895f4e0210210d9c5618dd1c581733e114b5b54ba5cbc11bc42f9274040418d3695988144a
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
index 50e68dfeca19..aef1da05f8aa 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/
 	!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/6060976/${PN}-ttf-${PV}.tar.gz )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
 SLOT="0"
 LICENSE="OFL-1.1"
 IUSE="fontforge X"