gentoo resync : 15.12.2019

3 files changed, 106 insertions, 5 deletions

diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index b72756253a8b..e71f04549ccb 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -3,6 +3,8 @@ AUX geary-0.12-libdir.patch 2742 BLAKE2B bd931c4577630001998a9b444226690002a8177
 AUX geary-0.12-use-upstream-jsc.patch 18753 BLAKE2B 818c36ed24c7a0cfdee0679e41243c8ace7a966947c64561808587ccc7bf2a8558a48b3245a494f82553d9fd4bbf712be00efc74531cd21547f9445cb56208a8 SHA512 40fce0b4098ab13adf6f2db0f6bf4fe419f77ee159074928d7e44d103d989ac86de609df7bb8d13e47e87986fceed0e5ec92365913ae24daba148769ec82d5b5
 DIST geary-0.12.4.tar.xz 1070368 BLAKE2B 7d4c07184cd99ed507839e3f2c53171bf75809e76ef92283a15d93bd3f074ed700f6db2de14263bf8f7c060526023a81e9123433cf11a353c68497a3b70e2bdd SHA512 5bf05390e06ecd7e3b3de35fcfa068e5ad475f1e4f67c4b2ff65d9f8162759cccc1aa47f0ed9c3a0a8d68059fa404d4360e019ac42cdfc86a8258790f0a6df7c
 DIST geary-3.32.0.tar.xz 2228056 BLAKE2B b9ee9e48fb901aa8fe8ef291b8332ac222d7581d1700170aa605071698ea0d8b698511c6e372c9a5056c3d7bf4885ec84aa389f7558fdd00cb4eeb43d745ee39 SHA512 eec6a552fe87c74d364d7242631f6ddfb6cfe35dc4f634ec7aa80342f9e02439255a2a4b12b0f88ee6369962058bbbdc64c390189bd6480a225685ad52cb68f8
+DIST geary-3.34.2.tar.xz 2411940 BLAKE2B 61c0f69b3327c487530180544bbe13d131e4236d6a205db90278b75e839294923176b41d423a52d18c5b36b6dda7865ddbaf4e929260c2c845a69a6527b4fae9 SHA512 d34886829e1330bfe7fe4891b5e368010f5742a5ac20ab057a902897df1f6c4145a882379d9dbe82e0c954a91db265b9758ddd2eb96b9c03c0efc0f6d8cc6ea0
 EBUILD geary-0.12.4.ebuild 2195 BLAKE2B a33f75b13f693671d5efea769caea8d16e622f18fcc72016af69f562d4bad3bac33c9a8cdfca265242a25acea6785feb5903f59ca9d39801b8394d3ff11e11da SHA512 b1242bafe73a2247c577e08084ed2d9a6b7b276c90b5dc354e25a44bacd1839f18b9760dc69702c9b3792bdc73cf1844cd286944c9259635f6ab3f354337d75f
 EBUILD geary-3.32.0-r1.ebuild 2071 BLAKE2B 5e73549b214c11f019b0ecb1826f5a99c2f4060949f2347952f4062069c848113a6d5ab3b5dc760753257783f3563c5499e2edfc67ab54adbd777c57a8be85a7 SHA512 5c0f666a0548458d396a378851300481ba6445318dac29db09fe0d18f67b02c686fb27505c7a70bb1c9a5f3501619ae8379a128fb592466a9333ed4395c9e6d7
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+EBUILD geary-3.34.2.ebuild 2124 BLAKE2B d3339a5ebdac99fa2f7f320ea08dc77c02aa9232988028d99b073ce254e2c49701d608c2b3110908d53a49bf77f0219caa5dcc182eb40a38dbcbf2d3dec69351 SHA512 82cffc1646f839f6cf81869b672b5ca4012ee66d4ab3b04d69760dc7c9516149095825d64d93906be3e04c1af4551d107c2fdb5b7c5e43f67e56ddbbf640b13c
+MISC metadata.xml 379 BLAKE2B de51f9dc4d75156955aa9f9d16396c237f9d0b9f130927806fb9f1de02566d5177a5eee7745bd487713af9c5320501fd47ff56d05b7d4dc906be0968328950f9 SHA512 8236050dbebf0f0e023e12280f6d62326817f142175c388eadb90963d2d7dc79a5efbcc7b4d705fc9c1de8276fafff228ef2c5392fe4aa53ea63cfbad03948c3
diff --git a/mail-client/geary/geary-3.34.2.ebuild b/mail-client/geary/geary-3.34.2.ebuild
new file mode 100644
index 000000000000..2ba8bb3a81c4
--- /dev/null
+++ b/mail-client/geary/geary-3.34.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.44"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
+HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
+
+LICENSE="LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons
+SLOT="0"
+
+IUSE="unwind +ytnef"
+
+KEYWORDS="~amd64 ~x86"
+
+# for now both enchants work
+# FIXME: add valadoc support
+
+DEPEND="
+	>=dev-libs/appstream-glib-0.7.10
+	>=dev-libs/glib-2.54:2
+	>=gui-libs/libhandy-0.0.9:0.0=
+	>=x11-libs/gtk+-3.22.26:3[introspection]
+	>=net-libs/webkit-gtk-2.20:4=[introspection]
+	app-text/gspell[vala]
+	app-text/iso-codes
+	>=dev-db/sqlite-3.12:3
+
+	>=net-libs/libsoup-2.48:2.4[introspection]
+	net-libs/gnome-online-accounts
+
+	>=dev-libs/libgee-0.8.5:0.8=[introspection]
+	>=x11-libs/libnotify-0.7.5[introspection]
+	>=media-libs/libcanberra-0.28
+	>=dev-libs/gmime-2.6.17:2.6
+	>=app-crypt/libsecret-0.11[introspection,vala]
+	>=dev-libs/libxml2-2.7.8:2
+	>=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
+	app-text/enchant
+	>=dev-libs/folks-0.11:0
+	dev-libs/json-glib
+	unwind? ( >=sys-libs/libunwind-1.1:7 )
+	ytnef? ( >=net-mail/ytnef-1.9.3 )
+"
+
+BDEPEND="
+	sys-devel/gettext
+	dev-util/desktop-file-utils
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+RDEPEND="${DEPEND}
+	gnome-base/dconf
+	gnome-base/gsettings-desktop-schemas
+"
+
+src_prepare() {
+	local i
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(cd po ; echo *.po) ; do
+			if ! has ${i%.po} ${LINGUAS} ; then
+				sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
+			fi
+		done
+	fi
+
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	# appstream_util & desktop_file_validate doesn't seem to
+	# doing anything useful for an actual release, maybe for 9999?
+	local emesonargs=(
+		-Dlibunwind_optional=$(usex unwind false true)
+		-Dtnef-support=$(usex ytnef true false)
+		-Dpoodle=true
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/mail-client/geary/metadata.xml b/mail-client/geary/metadata.xml
index 39980802b1da..2731a6978a67 100644
--- a/mail-client/geary/metadata.xml
+++ b/mail-client/geary/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="ytnef">Enable optional TNEF attachments parser support using
+			<pkg>net-mail/ytnef</pkg></flag>
+	</use>
 </pkgmetadata>