version bump wrt #503486, remove old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

10 files changed, 118 insertions, 411 deletions

diff --git a/mail-client/geary/ChangeLog b/mail-client/geary/ChangeLog
index c13303a7807c..d86f2a019717 100644
--- a/mail-client/geary/ChangeLog
+++ b/mail-client/geary/ChangeLog
@@ -1,6 +1,14 @@
 # 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.12 2014/02/15 20:42:57 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.13 2014/03/05 23:48:05 hasufell Exp $
+
+*geary-0.5.3 (05 Mar 2014)
+
+  05 Mar 2014; Julian Ospald <hasufell@gentoo.org> -geary-0.3.1.ebuild,
+  -geary-0.4.0.ebuild, -geary-0.4.2.ebuild, -geary-0.5.0.ebuild,
+  -geary-0.5.1.ebuild, +geary-0.5.3.ebuild, +files/geary-0.5.3-cflags.patch,
+  +files/geary-0.5.3-unity.patch, +files/geary-0.5.3-vapigen.patch:
+  version bump wrt #503486, remove old
 
 *geary-0.5.2 (15 Feb 2014)
 
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index 2a2d5fa3c2e1..9cc6feceaa4a 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -17,30 +17,33 @@ AUX geary-0.5.1-vapigen.patch 1210 SHA256 3a7904f5fdbcc8d8e5350820d692205dc955cc
 AUX geary-0.5.2-cflags.patch 682 SHA256 73eca296cf317759da4d67e650a315ff8bfc03bb638d9e9deb2a63da1192a63a SHA512 760e83d6262bb09dad8da61dba829c024377a44da78542c943481d02907f82903e97b2256aed7f6d7ef76c0ff3df39068d4fe8aab26369855369f2b7bca99c05 WHIRLPOOL e16afff6881948e6bcd7092d4d2eed7db859bf3c4653f774b11228bfe77cc562349e7ffae1c806242284c9901fdafe57fbcac9fafb47c3c534b96a2bc73abe15
 AUX geary-0.5.2-unity.patch 1070 SHA256 b400f2be0c635987940df3a4a0acc1805f72cf92c112c23aeaa064f9d458e7c8 SHA512 838ce853119c31b7edd5a256ca0c65ecc554c544df9927e86cb43be21cfb3f849931adb0e17f4905f1438095bd8c9888017e2cb3e250537928fa6cd008b5f304 WHIRLPOOL 86e4054f3746cc508d6e51d5ecc0fdf940f29859e740892c914fca796b4137b0731991305b420c64f11834d476bbc6769aabda7232e6d50972aa6449f7bcb3a1
 AUX geary-0.5.2-vapigen.patch 1210 SHA256 3a7904f5fdbcc8d8e5350820d692205dc955ccce105cacf8e099cb44f43a619f SHA512 16cb96080230390aa645faeae015cb996c6f48822c817b5540e65eea83a40738f18e5690b54140646800e494f1dd58b862708efe9566ef076ae51fb5dba5ac3f WHIRLPOOL 0f5c5c469c4b8708f7265338d2abf3130fb0c962e523da5170c426699fe211647f536e758d75c65c56381a0c70e347c8c524836e896fd4de2cb16fb9eaad2044
-DIST geary-0.3.1.tar.xz 499832 SHA256 a1bf8cc95022ce0894a340dea0ab94047ac7a7ea0066b8602b136c74e93ffaed SHA512 a15c21eeebe2ce72bbcdbf27f4290b1385633a72f31f764505e20ffa037afd9089ce774069892479ee04c49a29a56ecab3b1b9b4907a2e26c970ab25fe5a4f3f WHIRLPOOL c3ef67206f76390cff44d056316a1ad8d16272d7af82afa2652b513c454cff77d95112a83d758f74f2df4c4b8c048383d3018e878b94d2f7b3a3e695f32e2f51
-DIST geary-0.4.0.tar.xz 593296 SHA256 eb6418fe48ee2d25350999e6fc8fd23de15da5670569f4c2478f9435fe2a2ae1 SHA512 5a011d890134abfab0e024aed11be077bd0fa44012bd24b583d4e12886987ce77b1177dcc686df420818e19f016b4d9f1ff11d36553ef9a401a830ce42e9891a WHIRLPOOL 7e0cf1062281afeec5cca079be3ef1de9f2df50956b650159c180a96dd6d4b7e418cc8eb45f0a4dbbc2e460c4b942dced5396f5ee90322232eeb1f659fd60c87
-DIST geary-0.4.2.tar.xz 608384 SHA256 e111e1f650afb8fe35d3a9f8ce19f698ee41263d5b21b31bf0b5bd4a24a207b3 SHA512 61ca900f2327ea848413ccaa557940fd0e47b27d4d189f8179c7dbc64fc6d199909a3e3b38a797cab108370f04648ebb7c9beda9236b1f3761aa69aad6b58314 WHIRLPOOL cbbd4230c05e537507d1663e98bd0d6647fab11ffea613ecfabd83f4b1d40c93fa21fbc586f41873973a8b9accd940ddb2be66893239a35372fc24793e4cd4cf
+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
 DIST geary-0.4.3.tar.xz 608368 SHA256 58a4021bea6be813a1381597f23b646335c9e15c3a7d818c302752a7e07e37a0 SHA512 27681695fe3762d71bc51c9b9f08499a6846adecad894e186730e5abfaf3221de660170febad03530915ec03f0ce834745e9f057dda0ff9e772117bca7d39090 WHIRLPOOL 929d30f1f71a268a5548a41a15fc4163146dc6bee82b7cc38e998d829b6eb7b7120fbc9608e1c73978d462c0dc9b2eba5008854bf1e9aa7fab7e9d32fc7e8549
-DIST geary-0.5.0.tar.xz 609764 SHA256 7f3f442b2b7349e339b380de474d94e9a8ad625d16277277ea500747c3b7a5af SHA512 64f316ecd58ebe8d91f3d6422b4e5a056bd67303d51789a2e61e9044bdc066dd73f9177237109f34330ca64f2dd006de4d09fcb52ad129dca8e021a9da307a3d WHIRLPOOL 61c3fa33d3343c198ff28da0fbf200761b34b3b99959647bbf53f99e494d91ef6f266dae40caa764f576e895d2b3f770c8df57f3650f968428eb13533edce899
-DIST geary-0.5.1.tar.xz 733460 SHA256 12561187c7d2b8aa1115ca52d8959270ff38dd6db774df1cd39c9719a76bb1d1 SHA512 c316729cb0af48937b18a91b60a0fb4d256e0f97b0e92fc994ff8bd22aff4dca06e150276d7ec5ae64fc63e6d0f380b545df20d8cf2274a05f27487dd2f534d4 WHIRLPOOL 278b0c93fcbab18f98d15f4ba9881e3be4c74eeb8770320181ac2debc009a1140bafcdad907b7e66e02840b154017589a9454638cc1416c0fd3ead4524a23d71
 DIST geary-0.5.2.tar.xz 747848 SHA256 60f0ce7e5d4c8164d36622b20d037d222d7ef2fab2e537ec5c22619fdb67a738 SHA512 cbd8c7a0c0d1e5033f8cb6dce8e28e203a77d913f0e0cc88cdd98c8fe34605231c788ae797d74f1519dd7544427982865d375fb084c85d90b6b2acc987749eb9 WHIRLPOOL 09533a76c20fa8103eefacc93bc4fe7faafcb330722b4a59ed9b9298b61958e67d0f065fbd887ab6b556fe4e34791e06c520312bfc07f7490a0253194754018e
-EBUILD geary-0.3.1.ebuild 2216 SHA256 71f21eb35f0707585eb6744aa6b7d3527d56c1dbf69e93dbebff7d91ea7443ca SHA512 ea78d42e383f2895ceb62311596b84a678091c939e441777119b1263a92cfea3fbe3b30c201919d56348bb4112125118d097622a35e8e3ec0482dc673cc36583 WHIRLPOOL 27105e06b2a5764dbbdb6d4560a79cf7d727e9116800cb9002664529a08a1ad53f4635cf433780671b8d91b66aff9f2c4bf1f331a76e0bbd3f785bacec524227
-EBUILD geary-0.4.0.ebuild 2189 SHA256 7927f66455762cc75b1f9a76a5126f8fed6b9b15ea598cd07188d537e246cf49 SHA512 78d3deba3751849af7a8dc03fb816461eb8d2483302d7cf679629fcb44c1c93019666b12fc8f53dd1d27fc33950bb2ca8308b12eec5f75e3c59150cf48244dac WHIRLPOOL 297bfdb40ca8ed108f55cab61366a868d40bef83c5e6494ce8c23079d37fd835e8034cd4337056e6440271d5c33e74c7c482f9c0f43f9c92123d11861716cca5
-EBUILD geary-0.4.2.ebuild 2143 SHA256 5f76af444b9e4fb4aba730b6a7d20cabdf66842ceafa0b3fdfacd40cc321cfa0 SHA512 4ae04ef639adda0b65718ec3bdc10181fae96ed962aca219847438a97d71f4975e140ec16b51126aa0970a9624c1bf1c0022839ad7b55d93c1e4253e82773a77 WHIRLPOOL be7ade3738730d44cca53b6c58f296a24758c9d0d03fe118481e2c60380cf869ffa73e84aa3694a61c86b0fe1d2ca1f72b550cd2bf411fea468bbb3b79ad8f1a
+DIST geary-0.5.3.tar.xz 757908 SHA256 17ac5aa25d828d92e5a23d21194fcee71914961cbfa3064dd718bcecb9cbf2e5 SHA512 2f7a16e46d5dfc7240eeb3436cd13944f6de6e32ece38d20a17b459d1cf2833f5dd012eed263ec960819d22c188fd47db09e95792274d51d24dcf157299e464e WHIRLPOOL a05d6686faa35e11f25e518c9c5a597099b8e21216eb5e6f42f480bdb2ccb886ea8793d32821edf31deb96269673469d65ba5888fc03c677b656fce36921fde9
 EBUILD geary-0.4.3.ebuild 2155 SHA256 b792e406742ccc0b8f754df48f77e8e124ad971f45e1d7943f331f537d54b058 SHA512 10dd79048244eb1fd2773139d024d3eaf98119302032fc946c3e74587b902736fba7226505db3e7c29bc9a8e6e89f7aa598c6d84f7cdd260780296d6b2ffb065 WHIRLPOOL 44620e612ba1c0316b4e121df67128f8c449ba63b9695b4719cda3355f5ace3645e320879cb2b68a1952cd98a8ba90d369ce460f372ce087c44c038a594674c8
-EBUILD geary-0.5.0.ebuild 2133 SHA256 35e63a4c7e5d854efedcd9d78ca6004336b763a3cb582d20d1825604e4ad75f3 SHA512 1d318cc1235a7967671e29071e425607c0e1be7414dcd66ed58c43b00ceeeea8bb3e8bd7b511a9f75873e75923c4f104adb55fa397705df64be48b9b4753c61a WHIRLPOOL 65be202a3d57b29defbfa703c19d9b352320fed757938137c3ac1803635e443642c580dd193908807ee8b1fa9a68e895e7acafc3db26f70f2a15194a075ceaa5
-EBUILD geary-0.5.1.ebuild 2109 SHA256 79f82e28527c8a378571f80dd6b882b8ff721039e7be93e2b4d88605ee996472 SHA512 418c3fc90c27fa7ae60edcb0e6bb30a7c9c38d2e6fd448a938ba66645446bbd5d51e44731dfa6d2a27363b7be1e3a4796757ae905099a5fbf86b4ea4e5872672 WHIRLPOOL 5054ce4037a84e26eb212dbbbe136175e71f31a58666ebc9caec40dbd759859a8ee82c12f18e998cf67498f049546bcc5707b8fbcde12d2f7a100b7519b68f3e
 EBUILD geary-0.5.2.ebuild 2109 SHA256 adb66bda5e06430f66a4d0d16745e73b376a44fd8ed0a35b6a05321dbc342f89 SHA512 414d0fe150f9405dc4e736c853a046a741733074da0cfa58d4389165d4bbb61c5cc2132b77e999984fedc333627bef388ec3a4a5b2ebc11fb2db59fe0de1457f WHIRLPOOL c7405861c67d996062cfe4f75962d62858fcd53e9c8c5684354fc0eff1ed0bfa66dff35dde0d6f8fdbefe3556a864937b051d9694a4896e3be50a50494864c75
-MISC ChangeLog 2536 SHA256 35bf6764044291885229a95f0a1aa7fb6e296c0ee396e3d64e97dae1efbfb788 SHA512 d415e907c7720b3803b73769dfc11c9a10291453628d26375a25492ada5a89524138b0116bc53f7de7b681a7fbf5ca9a611fff533d8820804206dc53b6978fc4 WHIRLPOOL 5bd0e3f7ef4219b4d8d24beacfe46e5e03fd2421f3a75f2189045189ac7c714c07a1a4be68331aced0b65314acc06ac400f4fa70ed47011323368060a39594d0
+EBUILD geary-0.5.3.ebuild 2109 SHA256 aeff446e54adbf93e1c5a830916d573df3d7aba46d0652c979f7a95006762548 SHA512 93d481495584df37126e91ef637a02cc4198fd610107fb2b97b633a3fb218aa3ca325749c919e0c5e0c31b57e0c8c8b7c56fd1912b1ec9d5ff7dcca50dd21918 WHIRLPOOL a47ae27e9b9c4f88679e6c9319cd7c07d4de6968f201104b5a7319bce26a0c461881f509f1ecb861f59c5c78c3012f85dfbede0bb0c05fdec6cd62e4bdb4ad52
+MISC ChangeLog 2886 SHA256 68703fe5cf5bb8b42b26c49a79a0abd31dacb2c2fec326e19a35e76a8699e16b SHA512 1df6063913f594b9d1dc3374952de3fca9a56b9688109de4d6927b1e08273402dfc20e1a50707722b52216ea337b06444a15f860fbc6a2c8c54dfc53dff17c95 WHIRLPOOL b18ceb9dc2f13a7fc48943636baa2cfd6709a4e2ade9eedff8cbe3d15f635b1e16ea98b1baae87fb7c4b4f8ff7022df8a74c758d8ab6e3ec87041208735066c1
 MISC metadata.xml 235 SHA256 11ffaf6c7e9d3f8dbb48fb60cd443d87b61015bc3197206ca230f5c2b0c1e013 SHA512 8ff2114c96567a53f83cd07149d1530286182f54b3d1286b9ceccea41e85734be19d0f60876c73880d76baac48e698de91114bfda459e2ee6ade9c3237847133 WHIRLPOOL bd4bb26791fe245f1c2407aa690887524eef3e76de87b4f2b7049f436661ee78a669e4fe4415e227aa50ee404bbfbaf1822fa648792919f93cb3674fa0f55858
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS/9FRAAoJEFpvPKfnPDWzMnMH/24Wrnt+S2Rf6JtXftz7lmEq
-GcbDlRiNJ2zxY3mYjkKW54vtYqTmEZ7xd2IyCBJHSNmOqE29FAsvps2IOkr/TblK
-v8ubRh9mbsm7XLvIeuDzVY8XD9oLlbx5IRcF9ECsnc1TFmHgFZEJ+3B3BCqUv3iY
-wXF48OfAhyAna0/XOGL0HdQDwmwizn9qvazBRsdXy2+TWCkvKYNx9yx+fQA5QstF
-41STQOrX/UVpoPc3PxgCsLNKT2yqznaXa5weuA0n0lPIwy428oYTT5TFmxRg1zHg
-08hvCz2WWKCGuE8n5h8+dbSUI9TxFuccQDSlI9ak2beuhWJrbFFwfT5cBl0w2U0=
-=OIHc
+iQJ8BAEBCABmBQJTF7e2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgBjsQAIcFpsWlvD90DKikIUTqT0x5
+BvlOmXB5DcEQMJ/Q1PWrmW3mhxVChR2QIW9z+1uZl1BOer9HBlUICx3RF1G5OzzT
+NPphCrtSmkpMhPaWUaTPM9GSqC3+fSOTBl9I6v+DZjPSBSCeVeRU5YfLX2qSG1zM
+YXmbM1ZagQWTntvq7HuUgfR6zi7kIqSI3hSqGUH/NZ1IZCO7MQZYrBapeUUGmY+P
+s/TqX6oT3tM9gSPXUGECYSEBaK+ob16oFs9MBw0zhfmJo1kLaf2LxoVrqoGdRSNZ
+/veV1S19FQQl65sG5ev9B13ABO1qcrO8gIiH6BivPbR2wpf0nmjyCwEBpy5fYSqu
+bJ46Jk61O1wGuQ1yICMeED6+Mlt++GI9z6WTZSHQcdzknqeH96JTWT9srvEduwcw
+vkTP2ADcYIGdTDlYZk5knH7nMUz+wqxBQmnz+jaAQXfH5fVfBCc3WJ8atcMDk8go
+JXUI5Hw4WxVHi5JBxqgCfX1xrn3TFjVqWkaHQf3mbnya0Ss+gxQdtl6L3okFoPU5
+HPaSfjIcgc0QXvpAlGOqwQS03ACDpolwhFvMz3S+3OuAjR9hZJ7kE+LCyzxL17N/
+NKa5SrQ8eiAKIpWSfLvkvXGTupypv2t8+y65lQUDfnHwdUu6/FumbvaRXsXqQQ8V
+9sYJkN26080x4W/RRLrE
+=yz0/
 -----END PGP SIGNATURE-----
diff --git a/mail-client/geary/files/geary-0.5.3-cflags.patch b/mail-client/geary/files/geary-0.5.3-cflags.patch
new file mode 100644
index 000000000000..7a7666b2c4f8
--- /dev/null
+++ b/mail-client/geary/files/geary-0.5.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
+     -D_GSETTINGS_DIR=\"${CMAKE_BINARY_DIR}/gsettings\"
+     -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"
+     -DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\"
+-    -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/files/geary-0.5.3-unity.patch b/mail-client/geary/files/geary-0.5.3-unity.patch
new file mode 100644
index 000000000000..7bf282963564
--- /dev/null
+++ b/mail-client/geary/files/geary-0.5.3-unity.patch
@@ -0,0 +1,31 @@
+commit 1f875e8a629a54748eb46237fd854359aa5edbc8
+Author: hasufell <hasufell@gentoo.org>
+Date:   Tue Aug 27 01:40:45 2013 +0200
+
+    provide option for unity
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 66145c9..5d4464c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,7 @@
+ option(ICON_UPDATE "Run gtk-update-icon-cache after the install." ON)
+ option(DESKTOP_UPDATE "Run update-desktop-database after the install." ON)
+ option(DESKTOP_VALIDATE "Check generated desktop file for errors during build." ON)
++option(WITH_UNITY "Add unity support." OFF)
+ 
+ if (DEBUG)
+     message(STATUS "Debug build")
+@@ -46,8 +47,10 @@
+ endif ()
+ 
+ find_package(PkgConfig)
+-pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
+-pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
++if (WITH_UNITY)
++	pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
++	pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
++endif ()
+ 
+ # CMake's range-checking syntax doesn't allow for a bare less-than, so using
+ # improbably high version numbers to indicate maximum
diff --git a/mail-client/geary/files/geary-0.5.3-vapigen.patch b/mail-client/geary/files/geary-0.5.3-vapigen.patch
new file mode 100644
index 000000000000..18b3c8049b4b
--- /dev/null
+++ b/mail-client/geary/files/geary-0.5.3-vapigen.patch
@@ -0,0 +1,29 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Feb  2 00:17:18 UTC 2014
+Subject: gentoo specific
+
+--- geary-0.5.1.tar.xz/src/CMakeLists.txt
++++ geary-0.5.1.tar.xz/src/CMakeLists.txt
+@@ -399,12 +399,7 @@
+ include(ValaPrecompile)
+ 
+ # Vapigen
+-find_program(VAPIGEN vapigen)
+-if (VAPIGEN STREQUAL "VAPIGEN-NOTFOUND")
+-    message(FATAL_ERROR "vapigen must be installed to build Geary.")
+-else ()
+-    message(STATUS "Found vapigen: " ${VAPIGEN})
+-endif ()
++set(VAPIGEN $ENV{VAPIGEN})
+ 
+ # Packages
+ if (LIBMESSAGINGMENU_FOUND)
+@@ -615,7 +610,7 @@
+     WORKING_DIRECTORY
+         ${CMAKE_SOURCE_DIR}/bindings/metadata
+     COMMAND
+-        vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
++	$ENV{VAPIGEN} --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
+ )
+ 
+ # Geary client app
diff --git a/mail-client/geary/geary-0.3.1.ebuild b/mail-client/geary/geary-0.3.1.ebuild
deleted file mode 100644
index 4857e389f6ea..000000000000
--- a/mail-client/geary/geary-0.3.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.3.1.ebuild,v 1.2 2013/05/30 13:45:08 hasufell Exp $
-
-# REMINDER: next release probably swaps gnome-keyring for libsecret-1
-
-EAPI=5
-
-VALA_MIN_API_VERSION=0.17
-
-inherit eutils fdo-mime gnome2-utils vala cmake-utils
-
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
-HOMEPAGE="http://www.yorba.org/projects/geary/"
-SRC_URI="http://yorba.org/download/geary/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ayatana nls"
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/libgee:0
-	dev-libs/libunique:3
-	dev-libs/gmime:2.6
-	>=gnome-base/libgnome-keyring-3.2.2
-	media-libs/libcanberra
-	net-libs/webkit-gtk:3[introspection]
-	>=x11-libs/gtk+-3.4.0:3[introspection]
-	x11-libs/libnotify
-	ayatana? ( dev-libs/libindicate:3 )"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	nls? ( virtual/libintl )"
-DEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )
-	$(vala_depend)
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS MAINTAINERS README NEWS THANKS )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{ayatana,cflags}.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 "s/\s${i%.po}$//" po/CMakeLists.txt || die
-					rm po/${i} || 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
-		$(cmake-utils_use_with ayatana LIBINDICATE)
-	)
-
-	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
-}
diff --git a/mail-client/geary/geary-0.4.0.ebuild b/mail-client/geary/geary-0.4.0.ebuild
deleted file mode 100644
index 211bdaa65777..000000000000
--- a/mail-client/geary/geary-0.4.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.ebuild,v 1.2 2013/10/06 21:53:34 hasufell Exp $
-
-EAPI=5
-
-VALA_MIN_API_VERSION=0.20
-
-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="http://yorba.org/download/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/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}
-	gnome-base/gsettings-desktop-schemas
-	nls? ( virtual/libintl )"
-DEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )
-	$(vala_depend)
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS MAINTAINERS README NEWS THANKS )
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{unity,cflags}.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 "s/\s${i%.po}$//" po/CMakeLists.txt || die
-					rm po/${i} || 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
-}
diff --git a/mail-client/geary/geary-0.4.2.ebuild b/mail-client/geary/geary-0.4.2.ebuild
deleted file mode 100644
index 09ddfb3afaca..000000000000
--- a/mail-client/geary/geary-0.4.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.2.ebuild,v 1.1 2013/12/25 00:55:42 hasufell Exp $
-
-EAPI=5
-
-VALA_MIN_API_VERSION=0.20
-
-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="http://yorba.org/download/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/libunique:3
-	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}
-	nls? ( sys-devel/gettext )
-	$(vala_depend)
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS MAINTAINERS README NEWS THANKS )
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{unity,cflags}.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 "s/\s${i%.po}$//" po/CMakeLists.txt || die
-					rm po/${i} || 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
-}
diff --git a/mail-client/geary/geary-0.5.0.ebuild b/mail-client/geary/geary-0.5.0.ebuild
deleted file mode 100644
index 997909859956..000000000000
--- a/mail-client/geary/geary-0.5.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.5.0.ebuild,v 1.1 2014/01/08 21:05:24 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}
-	nls? ( sys-devel/gettext )
-	$(vala_depend)
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS MAINTAINERS README NEWS THANKS )
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{unity,cflags}.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 "s/\s${i%.po}$//" po/CMakeLists.txt || die
-					rm po/${i} || 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
-}
diff --git a/mail-client/geary/geary-0.5.1.ebuild b/mail-client/geary/geary-0.5.3.ebuild
index 55bd7a41b1df..fda0d25d7a63 100644
--- a/mail-client/geary/geary-0.5.1.ebuild
+++ b/mail-client/geary/geary-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # 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.5.1.ebuild,v 1.1 2014/02/02 00:36:51 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/geary-0.5.3.ebuild,v 1.1 2014/03/05 23:48:05 hasufell Exp $
 
 EAPI=5