version bump wrt #487054

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 25 insertions, 18 deletions

diff --git a/mail-client/geary/ChangeLog b/mail-client/geary/ChangeLog
index 21248ad587c3..1091ba36ce73 100644
--- a/mail-client/geary/ChangeLog
+++ b/mail-client/geary/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/geary
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.5 2013/09/22 13:06:15 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.6 2013/10/06 16:41:41 hasufell Exp $
+
+*geary-0.4.0 (06 Oct 2013)
+
+  06 Oct 2013; Julian Ospald <hasufell@gentoo.org>
+  +files/geary-0.4.0-cflags.patch, +files/geary-0.4.0-unity.patch,
+  +geary-0.4.0.ebuild, -files/geary-0.4.0_pre2-cflags.patch,
+  -files/geary-0.4.0_pre2-unity.patch, -geary-0.4.0_pre2.ebuild:
+  version bump wrt #487054
 
 *geary-0.4.0_pre2 (22 Sep 2013)
 
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index b5667bab4b01..efd56de07a3a 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -3,22 +3,22 @@ Hash: SHA256
 
 AUX geary-0.3.1-ayatana.patch 1308 SHA256 1b1220df7d9ec12ca8ef01c4a476023d5b2a2b01b30da6523f58b2dcb9bbb1f9 SHA512 bcc57fb0e1ecd40002937595814b598398c2b40ce589790a05d0bbf6388b60ff433fb8f7e949ea767b76f26b09f278f910f21cae54d16167bee13f7363a2470d WHIRLPOOL cc1d511e81f20110f9c7870d356966e9d957c39bf82a64f36799d3f55e7e8d0a8bb7cde8580b666bcee174a14c9cc3dada189e47ab599c294dc27687e8dcb68e
 AUX geary-0.3.1-cflags.patch 563 SHA256 ad9292af801d1ad276d70891d6dba69b0af7d7177fc3556692320e414d76bd84 SHA512 b6b605bc0bdd677b38f7f53ce548bbaabad721844d044ea486ef9a85fe34c26c45462b0dc077c27c194532dfa787ee648e633da02de0daee2ca55fc0c5dfe3cb WHIRLPOOL dfbc539858b4f50353a49f8e02e109ca02939655b591bac361abce33288796231eafd1c5b8f303098995d087168c7f7c9f227c81453f854e43da26e4fd0aaa77
-AUX geary-0.4.0_pre2-cflags.patch 682 SHA256 73eca296cf317759da4d67e650a315ff8bfc03bb638d9e9deb2a63da1192a63a SHA512 760e83d6262bb09dad8da61dba829c024377a44da78542c943481d02907f82903e97b2256aed7f6d7ef76c0ff3df39068d4fe8aab26369855369f2b7bca99c05 WHIRLPOOL e16afff6881948e6bcd7092d4d2eed7db859bf3c4653f774b11228bfe77cc562349e7ffae1c806242284c9901fdafe57fbcac9fafb47c3c534b96a2bc73abe15
-AUX geary-0.4.0_pre2-unity.patch 1030 SHA256 af9e813b6c019770b35a2bc4c0c55639a825c7a80101d98ed62ac650a8127e55 SHA512 4f45358ae2821e190892ba9329e692f6eb8c53cfa470ff0e1f4ba7ebbce4a2ae52c3ec1414247fa1a214ea63e88256a5086a40aa7c0fa3da745d33d7908fe401 WHIRLPOOL 81db73490e21696f936679aa40eaddfddd02eb8e755ebd690a61872504364dd856bfe8449681bf545582dcf154b8b3d9d077bfa3f3c694ecc98dcbc7717375f7
+AUX geary-0.4.0-cflags.patch 682 SHA256 73eca296cf317759da4d67e650a315ff8bfc03bb638d9e9deb2a63da1192a63a SHA512 760e83d6262bb09dad8da61dba829c024377a44da78542c943481d02907f82903e97b2256aed7f6d7ef76c0ff3df39068d4fe8aab26369855369f2b7bca99c05 WHIRLPOOL e16afff6881948e6bcd7092d4d2eed7db859bf3c4653f774b11228bfe77cc562349e7ffae1c806242284c9901fdafe57fbcac9fafb47c3c534b96a2bc73abe15
+AUX geary-0.4.0-unity.patch 1030 SHA256 af9e813b6c019770b35a2bc4c0c55639a825c7a80101d98ed62ac650a8127e55 SHA512 4f45358ae2821e190892ba9329e692f6eb8c53cfa470ff0e1f4ba7ebbce4a2ae52c3ec1414247fa1a214ea63e88256a5086a40aa7c0fa3da745d33d7908fe401 WHIRLPOOL 81db73490e21696f936679aa40eaddfddd02eb8e755ebd690a61872504364dd856bfe8449681bf545582dcf154b8b3d9d077bfa3f3c694ecc98dcbc7717375f7
 DIST geary-0.3.1.tar.xz 499832 SHA256 a1bf8cc95022ce0894a340dea0ab94047ac7a7ea0066b8602b136c74e93ffaed SHA512 a15c21eeebe2ce72bbcdbf27f4290b1385633a72f31f764505e20ffa037afd9089ce774069892479ee04c49a29a56ecab3b1b9b4907a2e26c970ab25fe5a4f3f WHIRLPOOL c3ef67206f76390cff44d056316a1ad8d16272d7af82afa2652b513c454cff77d95112a83d758f74f2df4c4b8c048383d3018e878b94d2f7b3a3e695f32e2f51
-DIST geary-0.4.0pr2.tar.xz 573352 SHA256 1d802b53168e137a983411eedd8f3c783bda23db227eedd39e51043968cd7407 SHA512 68de12aa8aadab26a0bfecdad5999dfa8b8432249841dfcc1072087478cd9a4408e0fdaa88512f59e7b369a7f57941014b11e73b41717ec24d7d3d91110f64ff WHIRLPOOL 3a21912268414a51de24d608da103e8f434a2629fc90589df5192e22ad5b123283475ce915fb7f0925caf86473f08a07bac0195d24110d8c423d4128e18e573b
+DIST geary-0.4.0.tar.xz 593296 SHA256 eb6418fe48ee2d25350999e6fc8fd23de15da5670569f4c2478f9435fe2a2ae1 SHA512 5a011d890134abfab0e024aed11be077bd0fa44012bd24b583d4e12886987ce77b1177dcc686df420818e19f016b4d9f1ff11d36553ef9a401a830ce42e9891a WHIRLPOOL 7e0cf1062281afeec5cca079be3ef1de9f2df50956b650159c180a96dd6d4b7e418cc8eb45f0a4dbbc2e460c4b942dced5396f5ee90322232eeb1f659fd60c87
 EBUILD geary-0.3.1.ebuild 2216 SHA256 71f21eb35f0707585eb6744aa6b7d3527d56c1dbf69e93dbebff7d91ea7443ca SHA512 ea78d42e383f2895ceb62311596b84a678091c939e441777119b1263a92cfea3fbe3b30c201919d56348bb4112125118d097622a35e8e3ec0482dc673cc36583 WHIRLPOOL 27105e06b2a5764dbbdb6d4560a79cf7d727e9116800cb9002664529a08a1ad53f4635cf433780671b8d91b66aff9f2c4bf1f331a76e0bbd3f785bacec524227
-EBUILD geary-0.4.0_pre2.ebuild 2218 SHA256 e27ebc8652152bc5f7fe2c8574034ab7ccbc83031013e0328d4a2e1891973c64 SHA512 5230b730cec444a41ff5de42b3fadefb4f499a2521929ab6e6ce0c23085968dba22955473d224db88c932530104077f6b0596a83eb8e157ae42939c0367e1e8f WHIRLPOOL 39b5377a6e1b3bbd60a009c3a235c124c60cf009d878caf4e5dedff1a5559612bf659c4f6c04e0cca7a693ed546b7631042642e5b4bcfbed447f933b4cdf967b
-MISC ChangeLog 1151 SHA256 62e80a610526fc00a45b1724bddb676a66d3f829dfa0a8bd457a5a1e442cd0d7 SHA512 5be673f106102d24fefa8e9f464f88cc0422cf1987dabbc5495f5ac44483f9b3f02bea790869f21848b56d52944f18fb2e919f9d73f3336a55b9f1edc00802a0 WHIRLPOOL f9f45a62bef39c6dd5abd7eb17d27873f32fdece3591010a21ba344bcc8bfab66607babd6e2850051b5356ea73c11d8dce45a9cfc26ca1fa150b035e8b1f5288
+EBUILD geary-0.4.0.ebuild 2188 SHA256 e29ac9158bb3350f5f3775f85618bc04ba9d2c49f5cdeb306d1cb6822a74ad13 SHA512 7dbce7aa9395138635ac450f572af32ef07b198a9e1870951b50fd8850d9f123cc3dd6ff6b139bffe7dc7b539d3e82e3036ea97d1d9cc9750b581ce444ed1bc0 WHIRLPOOL 241e0c2859d10b1a3dfc77d74e61d4b2e3c89cf86003f889ca64f6bba39eb91166945250d0e8c2e3e0fd4e78c477438965850287f8229cdf04abd01afefe4b67
+MISC ChangeLog 1451 SHA256 607eeeb20a5def6d2743f0f35b0037921c34580ec805fe80b52cbac38066bbf4 SHA512 874518d92ed788f0bdeb8bff8d9449c320a9c8374e3b4083d170a3bf06f012b87cf224cd6ef77135bae6a09a670e26f9c9f15fabd8b2ce8369ef3621a6741d0c WHIRLPOOL 88f8734dfa113c4d4b9beece806b190d011f5b56a24a873a6761fc899ee375caf47791837eb9abd352b29e3607c86b2e46ea3536d6a05d5686ae029c34dcb2cb
 MISC metadata.xml 235 SHA256 11ffaf6c7e9d3f8dbb48fb60cd443d87b61015bc3197206ca230f5c2b0c1e013 SHA512 8ff2114c96567a53f83cd07149d1530286182f54b3d1286b9ceccea41e85734be19d0f60876c73880d76baac48e698de91114bfda459e2ee6ade9c3237847133 WHIRLPOOL bd4bb26791fe245f1c2407aa690887524eef3e76de87b4f2b7049f436661ee78a669e4fe4415e227aa50ee404bbfbaf1822fa648792919f93cb3674fa0f55858
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSPutTAAoJEFpvPKfnPDWzoBYIAIYq0FD3fQXgw+hK38yuzceC
-VkNzZASV8aIX0EX9HC3wdgsXSeLg/U5usfRMIaFbzF7yd0HPC1/GobJh0+mcTD7M
-8xLikag7r8TIPgezgKO+OnBN0FAaus/lSxp54abjq3LYyxGalMD9eM6crUanuVgp
-758p0NuG6LS/m+WxwVsCP7OlKNUIG80Mc2AHH2h0T/xMDBp9XEotbbD2AY+6gKxy
-4bHUlXl76xABpw/AloslwX+H0gDgiXhZLuMkawkzObMAQsE3hyeBuQsgmDolV5R7
-4Vx7FbFJhyWJBLxoU5luWJe22O77NyhSHJY5zFSAyIUWerVUNH1ggrTmu5dWpAI=
-=OTq8
+iQEcBAEBCAAGBQJSUZLJAAoJEFpvPKfnPDWzz9kH/RygSHbmKR0e4lplPViBd4Vb
+mUVAhbqaiX6BrrwvtOhlNNTE/V5chATD3K+up2q+/b+0ExVgI7EoM1ILgqwL3LDj
+QpHz+nBCyBaSkiNExFkCAZaAyCkuHA6aXOnQw5/YlH8cCG1fSnWWx70oypPOSU4L
+6ghlcIbPt9uWt7jAINyq6ma5uanwgERg2oGci2DlHKSNXxcb6vyb6E1NUeXV7toA
+qf4Queo9QxMC+JlkKqJGAbP19ORn61XLA5fsxEbsrn1t0Go0VNYlDv7zLnRSUiVO
+yV3hF3MvY7s0WkBKeeumfrcRvapefz/AxQur5ISMStw4Wa9p/5Kpy0ZOij9ahf8=
+=VNWA
 -----END PGP SIGNATURE-----
diff --git a/mail-client/geary/files/geary-0.4.0_pre2-cflags.patch b/mail-client/geary/files/geary-0.4.0-cflags.patch
index 7a7666b2c4f8..7a7666b2c4f8 100644
--- a/mail-client/geary/files/geary-0.4.0_pre2-cflags.patch
+++ b/mail-client/geary/files/geary-0.4.0-cflags.patch
diff --git a/mail-client/geary/files/geary-0.4.0_pre2-unity.patch b/mail-client/geary/files/geary-0.4.0-unity.patch
index c2657dbe5889..c2657dbe5889 100644
--- a/mail-client/geary/files/geary-0.4.0_pre2-unity.patch
+++ b/mail-client/geary/files/geary-0.4.0-unity.patch
diff --git a/mail-client/geary/geary-0.4.0_pre2.ebuild b/mail-client/geary/geary-0.4.0.ebuild
index d5fe72efb87b..3d8fd417c990 100644
--- a/mail-client/geary/geary-0.4.0_pre2.ebuild
+++ b/mail-client/geary/geary-0.4.0.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/geary-0.4.0_pre2.ebuild,v 1.1 2013/09/22 13:06:15 hasufell Exp $
-
-# REMINDER: next release probably swaps gnome-keyring for libsecret-1
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/geary-0.4.0.ebuild,v 1.1 2013/10/06 16:41:41 hasufell Exp $
 
 EAPI=5
 
@@ -21,15 +19,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 DEPEND="
-	>=app-crypt/libsecret-0.11
+	app-crypt/libsecret
 	dev-db/sqlite:3
 	dev-libs/glib:2
-	dev-libs/libgee:0.8
+	>=dev-libs/libgee-0.8.5:0.8
 	dev-libs/libunique:3
 	dev-libs/libxml2:2
 	dev-libs/gmime:2.6
 	media-libs/libcanberra
 	>=net-libs/webkit-gtk-1.10.0:3[introspection]
+	<net-libs/webkit-gtk-2.0.4:3[introspection]
 	>=x11-libs/gtk+-3.6.0:3[introspection]
 	x11-libs/libnotify"
 RDEPEND="${DEPEND}