gentoo resync : 22.01.2019

4 files changed, 57 insertions, 30 deletions

diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 04bb473ad5cf..dcbe1db7427b 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,5 +1,5 @@
-DIST cantarell-fonts-0.0.25.tar.xz 351768 BLAKE2B cfdd7570c99db9e75658369df9eb243ddb6290dfe8017bcff12edf876134ba185083e70676369962a2a9f35365e92268625b47da286aca640927fb7a47073295 SHA512 c09c3ecb3d4c50f613234398fabd327ca92b8abbc27082e8e98f2944f3dd9f0c2ff4c022ff5e5503a86e724bb8e2fbf6cd081f8a29e91b4209f5bf0e32168c3e
 DIST cantarell-fonts-0.101.tar.xz 263480 BLAKE2B 79652cf87088a8fe505895cad1f2474e0cb52e4be8a977ae06442a0e8ca6ba6a7f93c811b14e56fd5e61a17c97175b2374d180e435cbac00af8c10b272461802 SHA512 52dbd8358de7e20146e627ab0b1298efb97ee335e45d8e63bab7c3a7d05314d0bb94ac448e34af4c6f7212623185a9e03a30eb24acee4915142e40af0086bbfb
-EBUILD cantarell-0.0.25.ebuild 641 BLAKE2B 6b42a567d4f3e9c39954865a322b561ffd0a1c5652fbfff951a42376fb26f737b062ecea048edfe553323910dd6f2ac0b0b0c72d030c5dd466a60b9fd49a7ebf SHA512 a7de207b7637b77982e1aaf5a2091afca6012a6f6f7b53a4f172ffea87a063e37a511380fb5354b6e912a0875391f43a28b7c6f41302cbb1fcb36206de95fc16
-EBUILD cantarell-0.101.ebuild 1257 BLAKE2B d15ca7d6cc7850ba457beccadd83e49ec2620d085956de26c8e54dce8a11f3c4e677905c0e8e0dfc6931bae287b7e394cd5edeb1bb99e8a79c89a3ead87550cf SHA512 158e28809080dd294030f2c4c81d315bc319d4f998aecba0d436f2084d623f8c1a40855f2e4bcafda1bb3b7c120aebd66e0533597fad41dc565ff1b7dd671463
+DIST cantarell-fonts-0.111.tar.xz 326216 BLAKE2B dad338329670674cf3815b2045f8f9a739a9e08913189cec67577982e58df8328e0dc185439bffb6bda0529846b844d0b37a3c9615210f23d47616969f7874b2 SHA512 638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e
+EBUILD cantarell-0.101.ebuild 1255 BLAKE2B 51c847b61bc6a1a03057da80ec77a895b0c9baca8286d068a4d60699aa700b3b358caa8039dfe633db2cb4be8610a2948030064bed2f4cf4caf8c81a65a2bd4d SHA512 56a8c9049dafab291dbd4c9d37162162e1eeb9b058de347cdb5e02ba661cbb3e279022971a8e5b5fb097876b5d108a4dec363b98313c6cbace3dd201122ccee3
+EBUILD cantarell-0.111.ebuild 1290 BLAKE2B c6d0b7390a17351692b18ad585c3634a6d4d043d20a15a1f22c27aa8252bcac7dc10705520c6ed0563b2e434d30d67a81872a72951dc73b8f544544c39216014 SHA512 95f892fba625c177945c529ce2002922223fdebb9b1949da9206481a265d42e7cadb2f18e3922d608af3c4389b53f118fdece43db0229abc9688c55fe9be173f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.0.25.ebuild b/media-fonts/cantarell/cantarell-0.0.25.ebuild
deleted file mode 100644
index 01b0262950d2..000000000000
--- a/media-fonts/cantarell/cantarell-0.0.25.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GNOME_ORG_MODULE="${PN}-fonts"
-
-inherit font gnome.org
-
-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 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/fontconfig"
-DEPEND="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}/otf"
-FONT_SUFFIX="otf"
diff --git a/media-fonts/cantarell/cantarell-0.101.ebuild b/media-fonts/cantarell/cantarell-0.101.ebuild
index 1f065b111b71..9f4627bcce2d 100644
--- a/media-fonts/cantarell/cantarell-0.101.ebuild
+++ b/media-fonts/cantarell/cantarell-0.101.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 ~s390 ~sh sparc x86 ~x86-fbsd ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="media-libs/fontconfig"
diff --git a/media-fonts/cantarell/cantarell-0.111.ebuild b/media-fonts/cantarell/cantarell-0.111.ebuild
new file mode 100644
index 000000000000..4556653596db
--- /dev/null
+++ b/media-fonts/cantarell/cantarell-0.111.ebuild
@@ -0,0 +1,53 @@
+# 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 ~x86-fbsd ~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
+		-Dbuildappstream=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	local DOCS=( NEWS README.md )
+	meson_src_install
+	font_src_install
+}