gentoo resync : 29.12.2022

3 files changed, 2 insertions, 53 deletions

diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 47c0e1788001..eccc0d2290dc 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,5 +1,3 @@
-DIST cantarell-fonts-0.301.tar.xz 570328 BLAKE2B 2e1e235fe8986366fa2b75cfc0e5417a3e2ab4a3d237a4cc7639d56a2ae698bfe1e2e573a64d0557bcb9823428928d623cadf4f5d8c424a4516a0e44b0390659 SHA512 84bd37e9eeeb3001d336af49634184552d77df3ca780ef4cd9166925c87710575ab0208f50df2e4f0216f3b64dbe0ef5288a271866244e6cd1cd5518462f8b02
 DIST cantarell-fonts-0.303.1.tar.xz 338316 BLAKE2B 1208f57b70a82d93e2714483d36b2a0027f4e3a04eb494b9e74207d20e074377061d6af9bce4f9f48a56d87ff67fe9def1b24ec33a5f3b7decd883d3ab328505 SHA512 f61c2df6bb04167a9623bac141773211486059a5569106c0ed096d6d1a5d57e599cc5b75b06be954859aef13c649f7617ae067d9936932faec0b2ce896fd31b5
-EBUILD cantarell-0.301.ebuild 1053 BLAKE2B 1d112bfdc81b4bec330dc446227966ecb1193b2f133b2a5d49da6b070a04c6d88d65eb1202992366686a52051fe6c4999606d3d3e53f583ca67539c4da3ad26c SHA512 08d49850b8d2bc09ac227c6371dc6cfbc63cb37fc819b24c4b8ddfe4e8eb7c2efc804f366bdda03027fea4294071100b3e574cc4b6968b8f9c03febc5e96b97e
-EBUILD cantarell-0.303.1.ebuild 1107 BLAKE2B 9ae663ba95ef3905ecc2c330e6378beed77b88d595161a40787daf4995fc506bf4cfe7eaef836293261adcf17db5540ded91cfca630c9359856acd1ea1185749 SHA512 26f98ed272fe701b7bacbe41bb764abd0d78e95bc4c03424b5942f238f1dbba4a6044888392322b3bfe7379376ced07aa3f3fea7c50f6ebe5b63683043546cfc
+EBUILD cantarell-0.303.1.ebuild 1100 BLAKE2B 99653affb77167bcb015ffc5ef2279e328f0ce6337fd086a9ab744a742e7740b352901bfbbe3987542220bb9f570ee3355cd36f6d0df37e24c587014315d7c09 SHA512 9834546da2825cfc87854044e3e9ba7cbd14c7d79ccd47768a93bb18778ec24398861ceddd62dbce2293ec3b96690c9d80f4d6b8033a4df0e0b388a51121d4dd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-fonts/cantarell/cantarell-0.301.ebuild b/media-fonts/cantarell/cantarell-0.301.ebuild
deleted file mode 100644
index 6b6e1bf355be..000000000000
--- a/media-fonts/cantarell/cantarell-0.301.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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/cantarell/cantarell-0.303.1.ebuild b/media-fonts/cantarell/cantarell-0.303.1.ebuild
index 84c00d2aa39f..99ce51235d27 100644
--- a/media-fonts/cantarell/cantarell-0.303.1.ebuild
+++ b/media-fonts/cantarell/cantarell-0.303.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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="