gentoo resync : 28.04.2021

3 files changed, 2 insertions, 53 deletions

diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 714e000cfe50..2a94a0505264 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,5 +1,3 @@
-DIST cantarell-fonts-0.201.tar.xz 508372 BLAKE2B 5a0fcf66e9c19a54c0051b79305a6b2628a2fa5aa3f67677732ba92a4f7e1ceda0d6c05bc971b1139bb87b8c5fecf8e7a350fb521f56926c072e8a03e35d4399 SHA512 c512244a1ed343b1b9fef3a630c1c678c6ef7f06efcda883af0dbab5478823f31c9bd5fc38b92ad1747704528c6e2589584ab94743f433957644d5386dabdc98
 DIST cantarell-fonts-0.301.tar.xz 570328 BLAKE2B 2e1e235fe8986366fa2b75cfc0e5417a3e2ab4a3d237a4cc7639d56a2ae698bfe1e2e573a64d0557bcb9823428928d623cadf4f5d8c424a4516a0e44b0390659 SHA512 84bd37e9eeeb3001d336af49634184552d77df3ca780ef4cd9166925c87710575ab0208f50df2e4f0216f3b64dbe0ef5288a271866244e6cd1cd5518462f8b02
-EBUILD cantarell-0.201.ebuild 1052 BLAKE2B a3e254e01939135b2d4e649af4ae069f943ad6313177b16cec740ef6dede4b9443e46757e6387c4aee5c33f7a9549b39f424e5a96fc3750e957fd0a8d6ecd30a SHA512 4d8c9b76366624c3c74933d8ece909720e049f38df61d5775b5cebfebb1fbd9f5ca8e4229026b3656f4a8cfb40cd276f774dd7fc56bcea85b487d8bf758e0529
-EBUILD cantarell-0.301.ebuild 1058 BLAKE2B a14f99b30ac0902cb6397d5786a145efdfb344e4b3230bea0aacc8a0dfeb7aa8efe4ca1567ff34c7d46455daf0570ed5b62f84ef37a6661a6e742caa4ab15548 SHA512 3a9852e32bfcbebb4cf3614024b1f6bc2a7297d305ae73bea18bff428988c95d4d5344b8077ed3c3b9bb199d2731157839e994a55d0df20d8787b2fdc67357ff
+EBUILD cantarell-0.301.ebuild 1053 BLAKE2B 1d112bfdc81b4bec330dc446227966ecb1193b2f133b2a5d49da6b070a04c6d88d65eb1202992366686a52051fe6c4999606d3d3e53f583ca67539c4da3ad26c SHA512 08d49850b8d2bc09ac227c6371dc6cfbc63cb37fc819b24c4b8ddfe4e8eb7c2efc804f366bdda03027fea4294071100b3e574cc4b6968b8f9c03febc5e96b97e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.201.ebuild b/media-fonts/cantarell/cantarell-0.201.ebuild
deleted file mode 100644
index ff27a99bd655..000000000000
--- a/media-fonts/cantarell/cantarell-0.201.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.301.ebuild b/media-fonts/cantarell/cantarell-0.301.ebuild
index 1f8f9dfcb3d9..6b6e1bf355be 100644
--- a/media-fonts/cantarell/cantarell-0.301.ebuild
+++ b/media-fonts/cantarell/cantarell-0.301.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 ~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 ~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="