gentoo resync : 16.04.2022

9 files changed, 8 insertions, 113 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 1931340e0789..e608d4273725 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index 6073a4ff0b71..512668bbef4a 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -22,6 +22,6 @@ 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-r6.ebuild 4851 BLAKE2B fd7167ffa59f825a9ad190e8c349fa14d01da09b7a4e31bde424f7a21fc04fbe74caf8d08e99346e96e8180b8e1d80d1d2c5df42b8e7f50bd590cefd81f32ce7 SHA512 ca145f3a4c7c705fbf7949ecaa6daa404fc45f2097bf33de15e0b05bdc9e6dedb956219ee7594487db69e70f2fb01e58c8757518d8f9c020e3ef40b12d6231c7
+EBUILD culmus-0.120-r6.ebuild 4858 BLAKE2B 4f00413dcc8c9a6ff9eb684f52748ec4550e66b62c1dba09fc8d39a98c291f77c8a59bbef75735f998189af47ce79a6dbed2d55c03d1347e0abb1f7212b145a7 SHA512 7c306a8dc456eb85c11d97521b71a9594adf30d5178b8c8944901b41e2494b026394cf98e3a5096d63e94a93494e68f53a1e3c4d84e57564e7e09bc96abf9495
 EBUILD culmus-0.133-r1.ebuild 5077 BLAKE2B cf061ca2c435ae5f37115b3da56f8d609c8bc3945d0645550ea482fa9b233f9b49d0e080edf76f00cf10ffb65d65f5df21210543f499ff04096a2e12b88ad552 SHA512 99fecfd5cb1c8fc5c46021f776cd20d54b5d2e4cbe48f10695a3c2a90bd53550d7a3fc5a0ee3a1b13c03c33382ac37219920d8b77246b986635c758cda76135c
 MISC metadata.xml 584 BLAKE2B e17e2f927ca8ff64b20776634432ab64c5b8326c33e3bab3515de28600b6953de97bcfc9479b812d5a6981eb7963c554d5dca4dd7a07c6487ef18c77959500ed SHA512 cf895876783fb180dd554ef5f76ed900df31f95b5f1820719004a26a5c5bed87c2274a95b9ef35013114b7c5004101d19e8f8f6a649eb53ae4501cd238d44125
diff --git a/media-fonts/culmus/culmus-0.120-r6.ebuild b/media-fonts/culmus/culmus-0.120-r6.ebuild
index 6d0109d856bd..7b17ca529106 100644
--- a/media-fonts/culmus/culmus-0.120-r6.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,7 @@ S="${WORKDIR}"
 
 LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="ancient fancy fontforge taamey"
 
 RDEPEND="!media-fonts/culmus-ancient"
diff --git a/media-fonts/fonts-meta/Manifest b/media-fonts/fonts-meta/Manifest
index fda3bb1b446d..d9ebf759088e 100644
--- a/media-fonts/fonts-meta/Manifest
+++ b/media-fonts/fonts-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD fonts-meta-1-r2.ebuild 2745 BLAKE2B f2a8e94b4daa4047d674c75ab2e70314b674a88da3f47d1aaed3664b901c64dd8021fdd2ccb95abf5f5c08e20c1c9101cd12fa2ba6b92318fd6eea1efb972a34 SHA512 7cf289ac63f8f0aa27762f627e6f2693420ba245bd0853022cd22328ea17dcb413994953c16109ab90342d05e31507e563af39d026c8cd1a2666883b83c5e89b
-EBUILD fonts-meta-2.ebuild 3212 BLAKE2B fcd8e3f713e010a5ead243a92bd8e8a24772be7feeb20f6484936e51caf6fb1e75b9880505306f5aca2e6d28b6c7737ee6ab7489496098e113cdc5acc1c3351f SHA512 297a534193ed9064c895974720757d08d1be50591de0a0aa506ca60aaca15a1230186865ce5ac6a4a777e173b0dd9b8732669cc4f029a7cb53f1582e35960fea
-MISC metadata.xml 812 BLAKE2B c9eee1e0d2fae68181130a6de4e13b2d70fca155ab48238e60a9cc2521c0857b030e4a8d64f0a91145fa8d0f1f8b8a1cbbc7fa2bae7d1a8bc61988c5109111d9 SHA512 a6aabcc608536e6f693be80b547e81a93208fe04d487c4c53a775a272c523eeacf6fefb641502ad8bd58829209c5ac8363334aa8d287f447d630ec8c2608010a
+EBUILD fonts-meta-2.ebuild 3210 BLAKE2B 1e32a8c398246dba7ae09c20606a2dcfc769d3486bff67999b6385870b615c08f2fb3a779121008d7b9ee18b6fd997bec3d6196397fc3bc2a6de4673d6ce33e0 SHA512 e36918f4720c427b3ae3d887bae0c40318a672167c4fd62bd025cca5e991c1be5e2836dbb9f414415539d2e1820c914674dc144833599073889afcd4523d3f3f
+MISC metadata.xml 747 BLAKE2B 3ad4b7ee375735839c02f528290eeb5110e0ecdd18f32801fc35fedad5665d9c39b96c2b539f1b8ef3da7cbd25289a52d39b4fd84566a88cb6e69c751beaa452 SHA512 25a8ec32947dd107575944bdf208e421011563b532b5dff6564e91de2e2a4b5d266ec1a098c141213c87fdbb359053e7f224723b66441f59743350e8cdca9641
diff --git a/media-fonts/fonts-meta/fonts-meta-1-r2.ebuild b/media-fonts/fonts-meta/fonts-meta-1-r2.ebuild
deleted file mode 100644
index 89e76d566b02..000000000000
--- a/media-fonts/fonts-meta/fonts-meta-1-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Meta package for fonts to cover most needs"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="+free +latin ms"
-
-LANGS="as bn bo brx doi dz gu hi ja km kn ko kok ks mai ml mr ne or pa
-	sa sat sd si syc ta te th zh"
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-done
-unset lang LANGS
-
-RDEPEND="media-libs/fontconfig
-	free? (
-		media-fonts/heuristica
-		media-fonts/liberation-fonts
-		media-fonts/noto
-		media-fonts/noto-emoji
-		media-fonts/wqy-microhei
-		latin? (
-			media-fonts/cantarell
-			media-fonts/courier-prime
-			media-fonts/dejavu
-			media-fonts/droid
-			media-fonts/font-bh-ttf
-			media-fonts/font-cursor-misc
-			media-fonts/hack
-			media-fonts/ibm-plex
-			media-fonts/open-sans
-			media-fonts/quivira
-			media-fonts/signika
-			media-fonts/source-pro
-			media-fonts/tex-gyre
-			media-fonts/ubuntu-font-family
-			media-fonts/urw-fonts
-		)
-		l10n_as? ( media-fonts/lohit-assamese )
-		l10n_bn? ( media-fonts/lohit-bengali )
-		l10n_bo? ( media-fonts/tibetan-machine-font )
-		l10n_brx? ( media-fonts/lohit-devanagari )
-		l10n_doi? ( media-fonts/lohit-devanagari )
-		l10n_dz? ( media-fonts/dzongkha-fonts )
-		l10n_gu? ( media-fonts/lohit-gujarati )
-		l10n_hi? ( media-fonts/lohit-devanagari )
-		l10n_ja? (
-			media-fonts/ipaex
-			media-fonts/ja-ipafonts
-			media-fonts/koruri
-			media-fonts/mplus-fonts
-			media-fonts/vlgothic
-		)
-		l10n_km? ( media-fonts/khmer )
-		l10n_kn? ( media-fonts/lohit-kannada )
-		l10n_ko? (
-			media-fonts/nanum
-			media-fonts/unfonts
-		)
-		l10n_kok? ( media-fonts/lohit-devanagari )
-		l10n_ks? ( media-fonts/lohit-devanagari )
-		l10n_mai? ( media-fonts/lohit-devanagari )
-		l10n_ml? ( media-fonts/lohit-malayalam )
-		l10n_mr? (
-			media-fonts/lohit-devanagari
-			media-fonts/lohit-marathi
-		)
-		l10n_ne? (
-			media-fonts/lohit-devanagari
-			media-fonts/lohit-nepali
-		)
-		l10n_or? ( media-fonts/lohit-odia )
-		l10n_pa? ( media-fonts/lohit-gurmukhi )
-		l10n_sa? ( media-fonts/lohit-devanagari )
-		l10n_sat? ( media-fonts/lohit-devanagari )
-		l10n_sd? ( media-fonts/lohit-devanagari )
-		l10n_si? ( media-fonts/lklug )
-		l10n_syc? ( media-fonts/font-misc-meltho )
-		l10n_ta? (
-			media-fonts/lohit-tamil
-			media-fonts/lohit-tamil-classical
-		)
-		l10n_te? ( media-fonts/lohit-telugu )
-		l10n_th? ( media-fonts/thaifonts-scalable )
-		l10n_zh? ( media-fonts/wqy-zenhei )
-	)
-	ms? (
-		media-fonts/corefonts
-		media-fonts/croscorefonts
-		media-fonts/crosextrafonts-caladea
-		media-fonts/crosextrafonts-carlito
-		media-fonts/dejavu
-		media-fonts/droid
-		media-fonts/inconsolata
-		media-fonts/open-sans
-		media-fonts/paratype
-	)"
diff --git a/media-fonts/fonts-meta/fonts-meta-2.ebuild b/media-fonts/fonts-meta/fonts-meta-2.ebuild
index 80a7f7e837ec..41b1f9a68f60 100644
--- a/media-fonts/fonts-meta/fonts-meta-2.ebuild
+++ b/media-fonts/fonts-meta/fonts-meta-2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="cjk emoji +latin ms"
 
 LANGS="as bn bo brx doi dz gu hi km kn kok ks mai ml mr ne or pa ru sa sat sd si syc ta te th"
diff --git a/media-fonts/fonts-meta/metadata.xml b/media-fonts/fonts-meta/metadata.xml
index 8050d5221c0e..f488664a10b0 100644
--- a/media-fonts/fonts-meta/metadata.xml
+++ b/media-fonts/fonts-meta/metadata.xml
@@ -15,7 +15,6 @@
   </maintainer>
   <use>
     <flag name="emoji">Install a font supporting emojis</flag>
-    <flag name="free">Install fonts for the "free" preset</flag>
     <flag name="latin">Install additional latin fonts</flag>
     <flag name="ms">Install (free) fonts for the "ms" preset</flag>
   </use>
diff --git a/media-fonts/paratype-astra/Manifest b/media-fonts/paratype-astra/Manifest
index 95c19779926a..e1a76ee255e1 100644
--- a/media-fonts/paratype-astra/Manifest
+++ b/media-fonts/paratype-astra/Manifest
@@ -1,3 +1,3 @@
 DIST paratype-astra-1001.zip 555264 BLAKE2B db1718554a25472cabb0bbf5e2e38176cea4f23b753e76547e1cd87e2719ddaea516418317a523aa26cddc4663b57e75bfab6a7a347531c8f2a4c81eb5ac1e35 SHA512 d92abe38224caaab97f5c18ce0f5d25ba43c970796c94cd0edcfa69364bff4443e0d145000e9afd27e9a870d0dd2c9cd47b20241e170ac9fa4fef751e5fcf854
-EBUILD paratype-astra-1001.ebuild 497 BLAKE2B 41aa78e891d294442dbb0ecaa24e012c2bc87632a8226b5805982262b2f95f43581d0015961360f13ab4b71465d47b88617d9341a941adc5d07859f310dc9fde SHA512 7ebcb85664c1f5597e37e795403bcae3d6229ac2e4f91a84e217d39b0fffa74e3be8707b935f812c84632b1a4b8ab5696c8d34ce804b089bd9031e285780c115
+EBUILD paratype-astra-1001.ebuild 495 BLAKE2B aee315f329effae8996f7781518e9f76ee90f7d7bd69f9a646a0a67dbf31895d273fec282779feff9ade06571856c7d2e41e6af9c0b6301fe9e241d1f1356214 SHA512 b42481c663c9eadece58ad93cc8cf3ada8c9986f2cbf26236cb266cb249f0884b626f69d4fa0dd395a39d2fa4e13cf48582eda14df37bb860012d91b0a88ddb7
 MISC metadata.xml 235 BLAKE2B f469fc8727ef3de05c8a1d43d640dd5bc6aee0158f82ba12c1024613b9c4c0a681f91528205ecd30d47cb9aca08ab788f7f595168bf0ceba25d8a2baf34b4cba SHA512 3229f3ecdc21ea952f5d40215f5a75129d165b9e34f80f7194842fe6362ed4f585470c7f6e9751825313345cade1f153d122d59f67016c26b5d21eeef64dfd22
diff --git a/media-fonts/paratype-astra/paratype-astra-1001.ebuild b/media-fonts/paratype-astra/paratype-astra-1001.ebuild
index ca7a2aa906b0..de8bdf696999 100644
--- a/media-fonts/paratype-astra/paratype-astra-1001.ebuild
+++ b/media-fonts/paratype-astra/paratype-astra-1001.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="X"
 
 BDEPEND="app-arch/unzip"