gentoo resync : 15.01.2020

3 files changed, 3 insertions, 57 deletions

diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 7443ed6a9a6d..915470cbf019 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,5 +1,3 @@
-DIST cantarell-fonts-0.101.tar.xz 263480 BLAKE2B 79652cf87088a8fe505895cad1f2474e0cb52e4be8a977ae06442a0e8ca6ba6a7f93c811b14e56fd5e61a17c97175b2374d180e435cbac00af8c10b272461802 SHA512 52dbd8358de7e20146e627ab0b1298efb97ee335e45d8e63bab7c3a7d05314d0bb94ac448e34af4c6f7212623185a9e03a30eb24acee4915142e40af0086bbfb
 DIST cantarell-fonts-0.111.tar.xz 326216 BLAKE2B dad338329670674cf3815b2045f8f9a739a9e08913189cec67577982e58df8328e0dc185439bffb6bda0529846b844d0b37a3c9615210f23d47616969f7874b2 SHA512 638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e
-EBUILD cantarell-0.101.ebuild 1245 BLAKE2B b569bdad8b7fe4022db0ab0250bcbfa62cd32226d509cff99273061635487b9fe2b168334de8fd5d1642cf81fe1687ff6c9c1b9698b558a7400a53435ae6c16a SHA512 92721ee7c85bad1e876bb6c4b91020acfe49226d20d4a4c6af329d5f21d62ae9ce1e22d8ba9b9e90d722c1d147b751d6d23349a6adb46c8711e2a446eabb062c
-EBUILD cantarell-0.111.ebuild 1270 BLAKE2B 343262d98986c11644c0ab999a4d565d90525e9f46992f9e5ea780cd44782d635341aca6e578494e7ef7e34d8aea614211a6659be4eec4cf575da265af450b9e SHA512 d44cc14f02242c9ae56188b0fbdaa07dadde631a699cac7c446a43e73bc39b9b834e307e781ba11ac0fc88219f862e2b6f02009b589932fca1c0532a6f07acf1
+EBUILD cantarell-0.111.ebuild 1269 BLAKE2B 009fdc60f267cdb55485d7012d89e8785bf1d811c35e13112c61c10b0d3ffef1dd08c43338820d123411b0c25cd5a55f4b21699f3c754ea5f2c0c0ab2ca011c6 SHA512 526f60e99bafc2ef5e07ce1053a2772d0fc4ef159e754445058179ec04f0b08ed00aa0934edfade10c16070117b2f75e9fc824ddf60b1f8f013230e8be533b3d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.101.ebuild b/media-fonts/cantarell/cantarell-0.101.ebuild
deleted file mode 100644
index 39f0ff55de62..000000000000
--- a/media-fonts/cantarell/cantarell-0.101.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="media-libs/fontconfig"
-# appstream-glib provided .loc and .its files required by gettext msgfmt for translation of .metainfo.xml
-DEPEND="
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-# Font eclass settings
-FONT_CONF=("${S}/fontconfig/31-cantarell.conf")
-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
-	)
-	meson_src_configure
-}
-
-src_install() {
-	local DOCS=( NEWS README.md )
-	meson_src_install
-	font_src_install
-}
diff --git a/media-fonts/cantarell/cantarell-0.111.ebuild b/media-fonts/cantarell/cantarell-0.111.ebuild
index 39e8373a117b..3eaf6029d5a6 100644
--- a/media-fonts/cantarell/cantarell-0.111.ebuild
+++ b/media-fonts/cantarell/cantarell-0.111.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="media-libs/fontconfig"