gentoo resync : 20.06.2021

5 files changed, 16 insertions, 4 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index fadd544b3cc0..5b9856473875 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/joypixels/Manifest b/media-fonts/joypixels/Manifest
index 72843c45e5ac..592fbf42badd 100644
--- a/media-fonts/joypixels/Manifest
+++ b/media-fonts/joypixels/Manifest
@@ -1,4 +1,4 @@
 AUX 99-joypixels.conf 1152 BLAKE2B d68b04bed7c538fde05b9865b55fa670dc4cd55689320dfd0ce01c0a9a8440bdab0fe99e3314b841028456fdd01e1f812fa089dd09819ca56598d6dcd943e979 SHA512 76fe520c31dc14434b3bfbef4fb9c91958296f2c89116ded863fe10a170e241624a72526cb4ab3fbb7ad450b6c3f2bdb219e1920ac223cda9791f6d9cb2a11ec
 DIST joypixels-6.5.0.ttf 25348564 BLAKE2B 4e38a3bb04f71292ba9003b52d050c04afe96eac5b99073560a6e39c781ad895102812093f4aa3b64670ff2907060e8ca1cfebbf00a22abc68315a1691713cc5 SHA512 abe44c631e5b1e7f7a2c59ae979beb381bbf10c04a157f67ca022cff5ee4c5162e3108b34fe55d4165f4b5e062755387f421363fa8ca8d600d5a005a534b0f4f
-EBUILD joypixels-6.5.0.ebuild 742 BLAKE2B a24aa3392bdce32f8ae2c4dd13c3526e89afd46de3740671d692ae0cc2721a6f3de9951aa3361992f2323406b87ecca9738ac42f69ac9b526325f35d08954c9d SHA512 c3f6c8e416f1c137693e7d340ce50d0e76aa91168135c734c55622da678a98b216fd9344aeabdda12015b230e2309619c636390f94acbfcf5e5cd23681eae9b1
+EBUILD joypixels-6.5.0.ebuild 1018 BLAKE2B f55eb3f3fe5520cce33e8ddb9cf74cb8986672834cdba54b8c016fcbdd47e2dfc021d4c75dd880c7b03e2ee334371a2de4919420c6c467bd0e562148778c9c22 SHA512 559bdbd228da555f9fdbf64eeaba2ac3e9fb821e48af7fb9560676e5329694589d420f7348a801ceb483bfb89ed16570a1add4ea683357c342397e10f6fe9513
 MISC metadata.xml 359 BLAKE2B 6a34261ec10702f5bec40975ab7723eee34e015afa5a4544146834c43a9a3b040d9ead5d5a617da0b8253e9e9a7e05fe9efae38588b02b8fa16f653d9bfc5340 SHA512 43bdd93da8962e2ca6d852356e206511754f1e5f0bda721ac6458c54abab89367fc137f686583dd9df6d83be82bad66f9858efc52ed1e5a002d6b3bacd8fdbb4
diff --git a/media-fonts/joypixels/joypixels-6.5.0.ebuild b/media-fonts/joypixels/joypixels-6.5.0.ebuild
index 1cdb17d51393..6c5b197d6a25 100644
--- a/media-fonts/joypixels/joypixels-6.5.0.ebuild
+++ b/media-fonts/joypixels/joypixels-6.5.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 FONT_SUFFIX="ttf"
-inherit font
+inherit font readme.gentoo-r1
 
 DESCRIPTION="A font for better emoji and unicode support"
 HOMEPAGE="https://www.joypixels.com/"
@@ -20,7 +20,19 @@ RESTRICT="bindist mirror"
 
 FONT_CONF=( "${FILESDIR}"/99-joypixels.conf )
 
+DOC_CONTENTS="Free for personal/education use only, premium/enterprise license
+	required for any other use. See: https://www.joypixels.com/licenses"
+
 src_prepare() {
 	default
 	cp "${DISTDIR}"/${P}.ttf "${S}"/${P}.ttf || die
 }
+
+src_install() {
+	font_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-fonts/stix-fonts/Manifest b/media-fonts/stix-fonts/Manifest
index 06f85edbe8a7..4ac43ec14366 100644
--- a/media-fonts/stix-fonts/Manifest
+++ b/media-fonts/stix-fonts/Manifest
@@ -5,5 +5,5 @@ DIST stix-fonts-2.11-STIXTwoMath-Regular.pdf 988219 BLAKE2B 614fce509b4890aff973
 DIST stix-fonts-2.11-STIXTwoText-Regular.pdf 371400 BLAKE2B 874d78aac0cf335f5d7a616ca54b8efd707d15a7e4a9d6c18541f277554688fc321f51d3c13d7ae9c55a916b8e4a17730c63c7886bbd81c509b6883c97096e5c SHA512 2cdfe0f3906480e8449c969ee52ece50322b27bf1d9f3da664086d0846fd5fdf007d5e1daf181a0cabc8b9a5c63645722f7ce3d3cd69d3930c6b3d3474e7f032
 DIST stix-fonts-2.11-otf.zip 2151460 BLAKE2B 77640182e9672a7d478068aafcd527620c3d1326af2670b8fab96c61fc0944b7158831c3262a09061cb3e66e81562f91078a1432740d4b733787699b740dfac8 SHA512 629723260c79cd2ee2e07e4b70a3022e6ad2dc476088108a17f85276673b28933b327f76f945b373b66cc52360df14ea4dcd8d9c9f4424af06d065eeda010208
 EBUILD stix-fonts-1.1.1.ebuild 674 BLAKE2B ecabf1d65d90ea6e2d0404ec3d8bf98a773b97c9cbb65a923773122eb0f59e8cb197f99be05af1174a7a7a53155a1314df45d3aa675c073f72c178023a562fba SHA512 f0fda106b17ecc778db50db86a4ccd090f6cf7f79039a6ca9f42837e918efe29a15c9a404eacd5546e43e67f4a9106fa2bc87f676a0c07fdd0989acc21dba088
-EBUILD stix-fonts-2.11.ebuild 990 BLAKE2B c687d32b8054a03ecb8b7a590746db8cf5b525e6cba21e939d07bbb1e51a8ccfff472ad0a90484f20996f7ed8b7bab0397d62cb0eabff67be9991882f29316a7 SHA512 d9e55c455fd52348532b467480f999b2a0511f9e4115892aaf7b7956b4a05c986e7db1959c90fff1d8246523aef42a50b3e4b680ca97a482b250722058a8e227
+EBUILD stix-fonts-2.11.ebuild 997 BLAKE2B d8e3a820d698eac3cf26e757ecb50f027c69eacf3ad0b573125bdd89b7ecdaf8419e1e873f962fbac31425983ab071d807af0497122e0f08e415627a4a9cdefd SHA512 e7df78ba7467c9251792a532a16c860713fe9aa42d8966cb027772c7c777c176d9652976de14865a0cb161f6420abf66dd983ae27401f134d956292c56943b58
 MISC metadata.xml 317 BLAKE2B 503285934782ce57ede0881674e286d015803dd09480ada7e3fffc9fffe82160bde205b2141f448f814c06fcb16066b32624d74c2c4f0a694c31bb6472d4c5ae SHA512 7e384d1a8a6b0cb9cba64e52c57cb6d762218f1032f0680c2e35efd00d1e4c92444fc1ab8e7782d6a85b1cbc7835faada3d2e89c9692383f54035bf7676e2af9
diff --git a/media-fonts/stix-fonts/stix-fonts-2.11.ebuild b/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
index 3955c4a40819..f3657945f89e 100644
--- a/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
+++ b/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/static_otf"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RESTRICT="binchecks strip test"