4 files changed, 160 insertions, 2 deletions
diff --git a/mail-client/geary/ChangeLog b/mail-client/geary/ChangeLog
index 144d3380b52e..662231cc4903 100644
--- a/mail-client/geary/ChangeLog
+++ b/mail-client/geary/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/geary
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.21 2014/09/06 16:41:05 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.22 2014/09/16 10:27:37 hasufell Exp $
+
+*geary-0.6.3 (16 Sep 2014)
+
+  16 Sep 2014; Julian Ospald <hasufell@gentoo.org> +geary-0.6.3.ebuild,
+  +files/geary-0.6.3-cflags.patch:
+  security version bump wrt #522926
 
   06 Sep 2014; Chema Alonso <nimiux@gentoo.org> geary-0.6.1.ebuild:
   Stable for amd64 wrt bug #518202
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index 0c4784cf53c3..5dc33ee6aa74 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,17 +1,42 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX geary-0.5.3-cflags.patch 682 SHA256 73eca296cf317759da4d67e650a315ff8bfc03bb638d9e9deb2a63da1192a63a SHA512 760e83d6262bb09dad8da61dba829c024377a44da78542c943481d02907f82903e97b2256aed7f6d7ef76c0ff3df39068d4fe8aab26369855369f2b7bca99c05 WHIRLPOOL e16afff6881948e6bcd7092d4d2eed7db859bf3c4653f774b11228bfe77cc562349e7ffae1c806242284c9901fdafe57fbcac9fafb47c3c534b96a2bc73abe15
 AUX geary-0.5.3-unity.patch 1070 SHA256 b400f2be0c635987940df3a4a0acc1805f72cf92c112c23aeaa064f9d458e7c8 SHA512 838ce853119c31b7edd5a256ca0c65ecc554c544df9927e86cb43be21cfb3f849931adb0e17f4905f1438095bd8c9888017e2cb3e250537928fa6cd008b5f304 WHIRLPOOL 86e4054f3746cc508d6e51d5ecc0fdf940f29859e740892c914fca796b4137b0731991305b420c64f11834d476bbc6769aabda7232e6d50972aa6449f7bcb3a1
 AUX geary-0.5.3-vapigen.patch 1210 SHA256 3a7904f5fdbcc8d8e5350820d692205dc955ccce105cacf8e099cb44f43a619f SHA512 16cb96080230390aa645faeae015cb996c6f48822c817b5540e65eea83a40738f18e5690b54140646800e494f1dd58b862708efe9566ef076ae51fb5dba5ac3f WHIRLPOOL 0f5c5c469c4b8708f7265338d2abf3130fb0c962e523da5170c426699fe211647f536e758d75c65c56381a0c70e347c8c524836e896fd4de2cb16fb9eaad2044
 AUX geary-0.6.0-desktopfile.patch 291 SHA256 421e461d09e706a4c1fd0eb77b9a964c9869f6908c15ee4ca5da1384a038025a SHA512 d7454a32822e2b19878bede717e707373646dc87ba5ed2fb0c972607f907b1ae57fecc7803e4eefeed1921fae3733fe73f593b6c0afec46e7da7efe561878b7c WHIRLPOOL 0d62ad643fb39dc744bccbe2f2a9133e2cc0c0675a9bb3a8a78cf1495fe799678a862da7a80eed8f4e68f6596f929556dd2ed2b411f6b1cbf75ef89a2156872d
+AUX geary-0.6.3-cflags.patch 659 SHA256 ddc9c29883b3e3e428f725e3b240ab4b618de96b29e1aed9ba7457048f0a8de3 SHA512 b227930bc9977f126d15f78fcc1ce77bec4b7155e5b6af87af14bf3fb09f7f00c01ad9d860475ac56b1227b554deac0e8da41f3911ff06f1e54c46ae2d740ff7 WHIRLPOOL 1bb0134d12b2382054778e38b6991ae14738f0031d492ea7e527c7912314bcfb014b4600617da950cecb8cc6400568309a8cc3557eec2133010cd91eb33a0273
 AUX geary-0.7.2-cflags.patch 659 SHA256 ddc9c29883b3e3e428f725e3b240ab4b618de96b29e1aed9ba7457048f0a8de3 SHA512 b227930bc9977f126d15f78fcc1ce77bec4b7155e5b6af87af14bf3fb09f7f00c01ad9d860475ac56b1227b554deac0e8da41f3911ff06f1e54c46ae2d740ff7 WHIRLPOOL 1bb0134d12b2382054778e38b6991ae14738f0031d492ea7e527c7912314bcfb014b4600617da950cecb8cc6400568309a8cc3557eec2133010cd91eb33a0273
 DIST geary-0.6.0.tar.xz 761408 SHA256 44ad1dc2c81c50006c751f8e72aa817f07002188da4c29e158060524a1962715 SHA512 636f8a75041aa710b989fb50097f17e45550f42aa4c0043b0b6f9176e503c3d4921a8255efeecf6d60199164e509071263cb4ca6690c8043c57fb456fbcb76c0 WHIRLPOOL c8cabafd2a9884663c3a5e2293b90beb685b1e7fa4c6c124c5d9dee536f27e9021906d213e98fbf327b0e1e6e052b87f1d2a5da5cac1ff19a93fe1103881e380
 DIST geary-0.6.1.tar.xz 779208 SHA256 7078dd9353b9ed2d404cb6a6d9b7d461614b283fc5a3a30630647a8c4a37a6f9 SHA512 d2cab979328551ed497fae80c5480f0b1f096f20703131c0abbe7ea0f0339c3d5c1b2c72902ad59a163a4608ac954e14ac5243ca752844739969a5b8f78f1075 WHIRLPOOL 921fbf30090cf8ec9d44f7941f090cd52549c759c2765053b3d710665ea11849edb83c1bdcc35b0a805abc7ae43541d64c39d91c3f7c249b373990529ee964f1
+DIST geary-0.6.3.tar.xz 791248 SHA256 2fa2612bf3821f8ff74664463a430729776f6f9bf31795156be2ca7959b52eca SHA512 4a4f26b3e88032191f2b683d8ed0d48401b278c4d1cc69c09731d9ca878450847a35c0653a8b9907ce81b989e713d1a41a40b7b6193f6e84a6e6f4eb4d5053f4 WHIRLPOOL 83e4a648a792639a10fde6eccf78db2fb582ebea4f5f0806091e4cc9f8550387e976e46b383b33819b32a25ec665116cfecfa3417acb72950f1eba3ffa48d403
 DIST geary-0.7.0.tar.xz 791656 SHA256 d6a0d584a1542ab358b1999478dc94ea0a920ce0ec6da5aa7c7d02d0d0b5cafd SHA512 23696d7104933a3406dca79e882286b290042eadcf8d37a2cb87bd64d4c9ff92721818c774eb62d9857823879e76a4217cca8e57dd6c587a36039cfb630eb841 WHIRLPOOL d8747cd2793b0bf36466d60f7b2db0ff1b0aa13de22d98829624ed5b954fe6af712a6c477c4ade90761921f83a569959b4e467b40210644e772d7ba061159e5e
 DIST geary-0.7.1.tar.xz 799176 SHA256 de2590eb0bed3f1fc330bd05abbf5bd568540336cd25a74feed3f2d76b2b9078 SHA512 1a9e669cb72a396615dbbf58ec6d4c7ec94ad7c0974f1d67a545c85c32aa9b2a0947bbefd1d2dcc25799884cf1ac49ba97d080c05a8c3e685ebcb652f8f27b68 WHIRLPOOL fbdf67fbac2e639b8150e122aa67217df5ab246457a08b35930aa80df2bde532c122033cff587ac7120ab21a1b4b060ea1062b5dcc7f351a6b564fe765c5c314
 DIST geary-0.7.2.tar.xz 811104 SHA256 a121c808d41a735b1d36c04bca742014a35baec423ebcfb97e43fd7bd9767b30 SHA512 151f20f064d88bc9c29ecef81c7c5a4c373929ea245b28108e152a91c729c1cfcf78794db443ef08bc594d2980f427dce16ddf8a630c8a44ce4b6f7b456f4c57 WHIRLPOOL 2e24c06d26ddf45ab94652800b6c5ab77f1243fd942e973deb51a6cc78a572d519fd92502d4c6f3f4e273465787205539d92966d37362882fef660eb0199acb2
 EBUILD geary-0.6.0.ebuild 2212 SHA256 9b696fa6dcdeb2e7a2bc273c5454c59a462e39f46ef960ee500606b4558bddec SHA512 fbe4cc980dd8ecb8bad91f19934b1134083700461b5f5336d623acf1dfe6b425a60168ff5812e6ea31c310db0aba8a19ede8b20b31b0304fe2f311ad533d8f99 WHIRLPOOL 70ffbd9d8a7f682549f2cf27a595e56cdad5211aa51ecbd3e971e730ebfea98a3a0e280bee41607515786acc1a3eba6a831f9130e59aacc3712eed4d2d8b4cb2
 EBUILD geary-0.6.1.ebuild 2215 SHA256 6e2051f43895a3362b338a8504487d0e33b816d8175dbde78625d659680eedad SHA512 808284b5e5669eccbb37738af08a62b325954ee1253a9847f2b67cb66c3d0b11fb8b99085baca5e2328d949306275bae1d3f6efed117754a3a56bdda597d9fc5 WHIRLPOOL ab92bd296ac2bc6d556a37539d85ed646f2cba824ddcf551200a08511d7fe6d66835ef208c79d5ea08ef34deebdcd90ae8726ccc0c5f157f088eddfca06f3f95
+EBUILD geary-0.6.3.ebuild 2255 SHA256 dcb9fe8cf056e8f56895d44605e7435edccb38888152b1ddf1cd8488c931e7ec SHA512 f24fc52d017768be69241dab947e45cefaa23739635009e8bb49902776e11b739d25e1f4b14b8982f94c6ccd93b99f0cac4d60aa468bcb4b46c4bb550251ee56 WHIRLPOOL 8d50559b7920e2855cd631e62193c7b50347066ba53cf6779da775cb94c79907b93b67adb74b28646f71a060c7b4f5b1a2952c4b3fea149dc5933c6719aeb17b
 EBUILD geary-0.7.0.ebuild 2214 SHA256 79b5f199ff076f07e9247b42bf00c6cdf95d17a85a23e2ce12bfd7e36201d85e SHA512 8d4ce0ae49db9d1908c915c95c787f35e41a1a431e1947f585ccd259e045cdeaea83fb5a890ac6c62056cc0e4122c4b22f0f419cb42d0dbc4f7b3045818c5eff WHIRLPOOL b1f21e8decfcfb65c732a3af6c84974a0dbb7efd77e9aa9ff9021547de3c60c8a47ccc2356b52d6ac02a0f8a4052985ce30a1f2201222450fefbddcd9e445556
 EBUILD geary-0.7.1.ebuild 2214 SHA256 e2bf7080a971bb2f8d4408b3e307bfa8bc96ff08e189e1511b043fcb2b0e17f8 SHA512 3a5e4114356815dd886a83406bff032ba6ef6d4638cbb2159cf5ce6fa54656ab41bd3347b0be4cc07f7330c1283b3a53659b6088452fb7d3368fdcf101d0dfef WHIRLPOOL 8add342c3d50dcdbac5eae55443555eaf9480f1de1a88705f24e5dc9d4a53b05ba1b6a0353ec98abbc2cb76b54e3d83e534d7d9b8a6c613b7bbe3e130329374f
 EBUILD geary-0.7.2.ebuild 2283 SHA256 d544bcad78f7d3032a598feda0f23194f0839ac6fecf895a088e67f72e72a305 SHA512 44f81354089bf1cadca22b22b2fdbf2cad9662b49262597c3eeb71a063345ceaf7c92e60492ebbd115b950c6b1e8db41de91ec99f1459a8cf67da495676b3eb7 WHIRLPOOL 5570c1d8a3902ea69e092e8a763243bbe4ca249703c8e4ca814196ccd71e138fc49a7b89bb4cab62213b7977403cd5736c14697107205a22d2cfe16d5641e9bf
-MISC ChangeLog 4438 SHA256 f9b90b32afb0c62a057f0a3b47c9eb46835e3f664fbf3651cb5bf2b528bc0754 SHA512 1409dcbd3d3bcc1d5f5b4717109cb592ca67fd6d5e391896cfb5da6f940f052e8b519111aebce0fc9e121e673d1bb737e1b3504438db091800990769e9e76299 WHIRLPOOL d2fead0ccf9126f6e515e86b20411ddf99e7f8f2f59f0c893efdcd05ccbc05b38b658bdf584ffba5f566f5fd5a63dd1dac606eabcc19f1b3f94edec81204bed6
+MISC ChangeLog 4612 SHA256 514a9c4191df859e41708c2620095ca4529caeaa64448144d6489b0899e3e996 SHA512 332026f0d7b77ce8ea441f4f785b597483121cb116c0b02651176fc58eed90b2e4d00bb6d4f3b1671cc7e3ea71224edac1ea45621cbfbdbbcf018f6aa3cbdaeb WHIRLPOOL 51648b37e18a803b154e22f857f2c53bf88700e347373ac50848fa80abb630cdaa5663729d247f034a5e86438f7a6412ebcfe130f9791b6bae2f73690a0f49e6
 MISC metadata.xml 235 SHA256 11ffaf6c7e9d3f8dbb48fb60cd443d87b61015bc3197206ca230f5c2b0c1e013 SHA512 8ff2114c96567a53f83cd07149d1530286182f54b3d1286b9ceccea41e85734be19d0f60876c73880d76baac48e698de91114bfda459e2ee6ade9c3237847133 WHIRLPOOL bd4bb26791fe245f1c2407aa690887524eef3e76de87b4f2b7049f436661ee78a669e4fe4415e227aa50ee404bbfbaf1822fa648792919f93cb3674fa0f55858
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJUGBCaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgoEMP/AqhJ/VxHDb4fIvoqW+xeNU9
+kJQQxw3HWzj0NY1fjDBzi4Kig6+UyvygeFnFm7hiDPu+kPBUrvJDOHKmJWuzD2xS
+7AulmCAFY0/MZpMzwG3hBCHByDw9oEIZmuXBwprdFIFATXMYvcaa5EJmHRkrLPRa
+MsJ7haqnkt96oLUqeqJAhm9NnO8F51g/pmZjBOcWWTA2dRbK2SHEXkNAYhWEoZas
+rnMNoRGSzLsvTdK90cMwvFosQUrWGEYeQoHuQjAlpkmMGBaCsXmXXw1j2bSv4p2m
+Qj+7YB0TRlaa29HzgCKws9UCXCWVe9hCeurg6/L2dKYLvlkOzTbJv7oJzqJLovTG
+k1nzCH94zrmdA9XWjPGdUR78mblOGObezMLFvXz7aYt7pAhLKuQzdwdpSXd9WsLu
+m9lx2lFq8tFuv4h9SsDJ+XlkdgKFZqUK8P+7hv71ua161b4CsWBqtNMq/zUBXHSq
+APLYPyhdmm6gFdyRvSJBM9XaHy1DVKjm6rAR/vMk6UlR8BiUXTj+ibMDu+FeklRl
+YyriDcoVkjdBMbYtuL5W1oVH9qSahsUJekQ8A6odGgbFCeEv0MshTtx2rT15C0Ee
+ORo6Akl4f5W2wpM4l5helw9dxEb5SH21Uf6B+TDqX2wcOoRN6CYkqvKPTuZrlNML
+UQ8a/44UHy5s9uSr4vri
+=1XPR
+-----END PGP SIGNATURE-----
diff --git a/mail-client/geary/files/geary-0.6.3-cflags.patch b/mail-client/geary/files/geary-0.6.3-cflags.patch
new file mode 100644
index 000000000000..959ae4b1f34d
--- /dev/null
+++ b/mail-client/geary/files/geary-0.6.3-cflags.patch
@@ -0,0 +1,27 @@
+commit e41cf68206eb16be678eeaa1dc998d94d2f93d57
+Author: hasufell <hasufell@gentoo.org>
+Date:   Tue Aug 27 01:40:58 2013 +0200
+
+    respect system CFLAGS
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5202b99..949d494 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -471,16 +471,8 @@ set(CFLAGS
+     -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"
+     -DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\"
+     -DGCR_API_SUBJECT_TO_CHANGE
+-    -g
+ )
+ 
+-if (NOT DEBUG)
+-    set(CFLAGS
+-        ${CFLAGS}
+-        -O2
+-    )    
+-endif ()
+-
+ if (REF_TRACKING)
+     message(STATUS "Reference tracking: ON")
+     set(EXTRA_VALA_OPTIONS
diff --git a/mail-client/geary/geary-0.6.3.ebuild b/mail-client/geary/geary-0.6.3.ebuild
new file mode 100644
index 000000000000..ae36f130d002
--- /dev/null
+++ b/mail-client/geary/geary-0.6.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/geary-0.6.3.ebuild,v 1.1 2014/09/16 10:27:37 hasufell Exp $
+
+EAPI=5
+
+VALA_MIN_API_VERSION=0.22
+
+inherit eutils fdo-mime gnome2-utils vala cmake-utils
+
+MY_P=${P/_pre/pr}
+DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
+HOMEPAGE="http://www.yorba.org/projects/geary/"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/geary/${PV:0:3}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DEPEND="
+	app-crypt/libsecret
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	>=dev-libs/libgee-0.8.5:0.8
+	dev-libs/libxml2:2
+	dev-libs/gmime:2.6
+	media-libs/libcanberra
+	>=net-libs/webkit-gtk-1.10.0:3[introspection]
+	>=x11-libs/gtk+-3.6.0:3[introspection]
+	x11-libs/libnotify"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	nls? ( virtual/libintl )"
+DEPEND="${DEPEND}
+	app-text/gnome-doc-utils
+	dev-util/desktop-file-utils
+	nls? ( sys-devel/gettext )
+	$(vala_depend)
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS MAINTAINERS README NEWS THANKS )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.3-{unity,vapigen}.patch \
+		"${FILESDIR}"/${PN}-0.6.3-cflags.patch \
+		"${FILESDIR}"/${PN}-0.6.0-desktopfile.patch
+
+	local i
+	if use nls ; then
+		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
+	else
+		sed -i -e 's#add_subdirectory(po)##' CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDESKTOP_UPDATE=OFF
+		-DGSETTINGS_COMPILE=OFF
+		-DICON_UPDATE=OFF
+		-DVALA_EXECUTABLE="${VALAC}"
+		-DWITH_UNITY=OFF
+		-DDESKTOP_VALIDATE=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	elog "For libnotify sounds you will need"
+	elog "\"alsa\" or \"pulseaudio\" useflag of media-libs/libcanberra"
+	elog "enabled."
+
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}