gentoo resync : 16.04.2022

4 files changed, 3 insertions, 108 deletions

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>