Doesn't work with automake-1.12 (#425296 by Pascariu Olimpiu), drop Werror usage allowing it compile against libgdata-0.10.x (#415043 by venom01 and Peter Alfredsen). Drop old.

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

6 files changed, 37 insertions, 468 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index a181e17affb7..958c91dd2073 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.338 2012/06/24 08:45:02 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.339 2012/07/08 11:30:29 pacho Exp $
+
+  08 Jul 2012; Pacho Ramos <pacho@gentoo.org>
+  -evolution-data-server-3.2.3-r1.ebuild, -evolution-data-server-3.4.1.ebuild,
+  -evolution-data-server-3.4.2.ebuild, evolution-data-server-2.32.3-r2.ebuild:
+  Doesn't work with automake-1.12 (#425296 by Pascariu Olimpiu), drop Werror
+  usage allowing it compile against libgdata-0.10.x (#415043 by venom01 and
+  Peter Alfredsen). Drop old.
 
 *evolution-data-server-3.4.3 (24 Jun 2012)
 
@@ -1891,4 +1898,3 @@
   +evolution-data-server-0.0.97.ebuild:
   initial commit for evolution-data-server ebuild. based on ebuild submitted buy
   Joe McCann <joe@breakmygentoo.net> (#35456)
-
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 45ada11c2295..ab26ab05f556 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,46 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX calentry.schema 3661 RMD160 68dfc3a8bbf08a1cf2713727c6617b2de613cb7c SHA1 06ddcc64c3b2b3230fbbef21a7e2a682bd95788c SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431
-AUX e-d-s-camel-skip-failing-test.patch 660 RMD160 0907bb916a124d689f1880016eb8013971944016 SHA1 7ef6fd67bddbba16b3c6dd24a9b50ea9f8f5aa86 SHA256 f89f7635e9a5ddc2aa2f713a6d7eb9322f3416f8f9ad1cba1a113f65a1eaacb5
-AUX evolution-data-server-2.31-gentoo_etc_services.patch 1350 RMD160 a2fe65e31e3dad58fd5aef1e9bf7cdd02b540f8c SHA1 aef1a5fc05262c1049306c50a5c91ad9111f9b22 SHA256 1dae07ed5cb124c2da6e0d28f4e64555b6fb2bc012ceee3506f0af6e3e41102a
-AUX evolution-data-server-2.32.3-g_thread_init.patch 5091 RMD160 bce945ef850cfc5cd05b114505d943d0316882a3 SHA1 a9fdd5583cc827445caa9597441c4ee3b1761028 SHA256 23d3bd95ab952dd572547b64e1c430443586094cd8049b5034c12811fb7be162
-AUX evolution-data-server-2.32.3-gmodule-explicit.patch 2137 RMD160 f1b8068f3e0477768a9ea58ba304207c560361fe SHA1 018d57658e8ea4f011abc4356d680267ab0dbc2b SHA256 cb936b70909a9a6588de0c8ba8b1c2fe2f9a5b288620c40d992774a9302f05df
-AUX evolution-data-server-2.32.3-imap-move.patch 2647 RMD160 4d337e7ffad413ed8c3357e45fca18009cd0a60a SHA1 6cd6f0499ae9f8eb002ce7e68799a0b801ea87d2 SHA256 8effa465fc2913f22f030d66f9726a6e9dcf327f7abbf1774b1bfb9f4cc1c40f
-AUX evolution-data-server-3.2.2-g_thread_init.patch 5340 RMD160 e817ddd6680eff219efa08e9960461c9a213ac7b SHA1 fdeb1f6ab96e9e94ae4301666353eeddaf644a01 SHA256 9587183cc7ca99a50ffd26236dee333e82954c07047fc1738f0f895963476328
-AUX evolution-data-server-3.2.2-gmodule-explicit.patch 2035 RMD160 22b11fd2e4888d791aee754f7af358bb63433c05 SHA1 bed3401a4cd6084d235bdd37cde6624da117763f SHA256 2930f89bb6b0863150844fa827fbaff9d189d33d48f618f13cc7d92d10e0690e
-AUX evolution-data-server-3.2.3-caldav-cannot-modify.patch 875 RMD160 d19cf6a286adedc6d7027c2331cf81b223af78be SHA1 18b9eaf9e11e5bae9b18f3187ed69bf96510623e SHA256 d6f73c19347081f1927282d4c672146207c5c092a87b90d2604fed6405f87ed1
-AUX evolution-data-server-3.2.3-google-calendar.patch 4374 RMD160 421a177102117cae5a96089148886dd2346aa78b SHA1 eff68e75f07396e62d780285e9a383a1f679626b SHA256 e0d13a6f81b67ddf8ed6655c5f725c00d560c8bf3f7a56510aad2881fac56308
-AUX fix_relink_command.pl 4074 RMD160 517048bd503d3c0cd5a37db6fb50d37f67f66ac5 SHA1 efc9936fb8a0a67711c7e9949df87a6bb3fe0344 SHA256 f6da0e687f7e64eab82671def4b7445602d1bf64e9b56c3c188d43fadc7dabc2
-DIST evolution-data-server-2.32.3-patches.tar.xz 24072 RMD160 2508b5b101f59bb383020728a8abb9ee2eb7836d SHA1 76b86f747415c117c660ec70561a786ff772d2b2 SHA256 7b1f29fad87a7e868736380c69880a29ddf5d4bd365734df53042e4bc9e8b0fa
-DIST evolution-data-server-2.32.3.tar.bz2 4322281 RMD160 adc8b07aef41a89d16fc426541c12190a3688b8f SHA1 cbf32c3438c4f1650b35b87007a337ebc1c56cec SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c
-DIST evolution-data-server-3.2.3.tar.xz 3729592 RMD160 9c352af61ff65592dd40928bbdb9ce0cf262046c SHA1 b96936bbeae52eb35113003f7d4e96f09a4fef25 SHA256 8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c
-DIST evolution-data-server-3.4.1.tar.xz 3877120 RMD160 6c21f67daf5504d7a3dbb2333c08b2a5285fc109 SHA1 cd04235696a793f9fda54dfb68c9789e589be06e SHA256 378c4eedb11ea359c49734393ba764ac1f1230b298c36d2256129dae00c78298
-DIST evolution-data-server-3.4.2.tar.xz 3879040 RMD160 01be750debfb5e3daf2b92ab0f01a25791fa9cb3 SHA1 fe1cba6f54b18eefae2472d6588496873ac5c0be SHA256 9020337a8ce02ae13c2bcbab80784bfbc6b73803d91a3cacc6362426036f6285
-DIST evolution-data-server-3.4.3.tar.xz 3645752 RMD160 9b33dc19e572db7bee292e38e73d36135fa148a8 SHA1 40fc66ca36977a5a35fcebfb9997c3a5fe86ef18 SHA256 455d0ee5ba5f1638f593476427697c9b5fc9668389b18f170449710f711626d8
-EBUILD evolution-data-server-2.32.3-r1.ebuild 4669 RMD160 6b7ae7ec4b48af2ea9c2dd755775bd784ce2059f SHA1 0908d474d443bab5c17274ac2df4ce392880897b SHA256 b617dd397ebf949c4947a2072e6b2e1236a99efe3fcc40a8831ae74be3eaabb9
-EBUILD evolution-data-server-2.32.3-r2.ebuild 4927 RMD160 b8fc2d5c3aecc7440a094f82a58c185bcade7f36 SHA1 41f71e3582357797b8a2f3960581d6a8b9c8cda8 SHA256 ef197c74b73133e780d4d087266adafdead9c80f8ba507d98ed2dc59fc456188
-EBUILD evolution-data-server-3.2.3-r1.ebuild 4331 RMD160 0912e2cc516d5f87874c05ed7e4378692feede05 SHA1 7ec63766dd07205b5128437f9c1ef6c662eb5afc SHA256 9ad2605c2551afd67aa387b039eb758e3f633a052eaee2dccd7fc921ea41ef03
-EBUILD evolution-data-server-3.2.3-r2.ebuild 4649 RMD160 a3f2c4f991514dc1bfb37d7c1f024c2d0fd0bb2a SHA1 6aaf3081c474ac35ba32e59e48214f410ee844c6 SHA256 01a10190b9775c9ec00a77f742445e0dfeb74cfafb25ede6215bc2686792b590
-EBUILD evolution-data-server-3.4.1.ebuild 3998 RMD160 8ad3f2359f966379f76967a9621dfcd2fc52695f SHA1 614c0e5becde4664b236f3a81aac2735ade41a58 SHA256 18b3b55fd6d6a7035f6ed22ef97005ab555035de12699be8bb261719942818f8
-EBUILD evolution-data-server-3.4.2.ebuild 3998 RMD160 b3ab65aa7ee931fdcdf708743e133aca04a512a5 SHA1 f879628d343f5e5ebf6b0619d35ab6aa741ddb1a SHA256 61dc843fe73de3101b2c582b9a5bfb25ec1386b7fedfe38e74ddea64c903aca0
-EBUILD evolution-data-server-3.4.3.ebuild 3997 RMD160 b54b316dedc11b98e210bb6cb1ac3c44b85e1298 SHA1 e3f4eed3051dcb5adb4a3e2a83d01fbe945d5d7b SHA256 a429dfb1f54f51e3d225aecdd30ce7a7416b1ec562afd1bbf2bad0693c8b213c
-MISC ChangeLog 66408 RMD160 03519f7f2f081b5b86d6c2bd76ae45cfca254427 SHA1 3a5f86b0458dd4d1c7cbe2449ab158421dba1b9f SHA256 896355416f5ddec718e75ee7d530b31bf41be21dc7b3cf9f71093f58827736ed
-MISC metadata.xml 535 RMD160 206f4b4067eab119530224247177d5f8ca6c97e2 SHA1 21a9ce92639d7c5aed6b189eca4f40b00b97778b SHA256 f458f1517ae769596f0dab7860b2789867e773eb32ad7cc00279dc7e2e82d64c
+AUX calentry.schema 3661 SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431 SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834 WHIRLPOOL 2255a4b0b98f55476388bb97ac5bf1bf2b7107b56c2a93f55142e7ae0892c8f93874fd0731663362bacb4ad85302a6cb8a22a7228bba0724fb45d1eb37f406a1
+AUX e-d-s-camel-skip-failing-test.patch 660 SHA256 f89f7635e9a5ddc2aa2f713a6d7eb9322f3416f8f9ad1cba1a113f65a1eaacb5 SHA512 c5bd8e1d86c000dc9dcfe0ab4d78df7d064fafb650c086b31e5b15e4e2ea269627eaf19b9743b7354e32a60e0aced19979d1c84be329b557cfcd23e019765121 WHIRLPOOL c21875187b5e86c9ca712b3d29cb81c2e9c923e08690fdbf12b86d8aa06e01707478230d67b855a0035c4dfa6e667a63d0ee5bbacd36ca9a1d99b7132fd7c90a
+AUX evolution-data-server-2.31-gentoo_etc_services.patch 1350 SHA256 1dae07ed5cb124c2da6e0d28f4e64555b6fb2bc012ceee3506f0af6e3e41102a SHA512 738d5c38239a509949f49d2b6c8cee1bf9996ca501b0daaae9b194bb8a487c0841e80fcbb467ff0fcd6369c3e78154619c48459bd559700a66e4033ce88cecb2 WHIRLPOOL 027c8020ba7f2d1d4f6a7b43dffbdbddd29c0c28e7082aee8a9c653f3fb78f78789da45481aaca0250b5c8905bc2ba78cdeb535a2b426b2e97c7ba79409f4f7c
+AUX evolution-data-server-2.32.3-g_thread_init.patch 5091 SHA256 23d3bd95ab952dd572547b64e1c430443586094cd8049b5034c12811fb7be162 SHA512 79e7606a9d2e2f1b3358dd47dd2b66152c008f57cbbdd411e5373da16441fbcb6776ea03a9a7badeb04370e026b0cc1944769fa3466b6593d003c234296c3573 WHIRLPOOL 61c19d778226795699d6748dd3fb7c471e74577f6341d7d611f691abc96ba1c15821e891077cd7a8ca3cea4be28bf8019c1c2eee1f8dfe4e3cad4deb23be0f8e
+AUX evolution-data-server-2.32.3-gmodule-explicit.patch 2137 SHA256 cb936b70909a9a6588de0c8ba8b1c2fe2f9a5b288620c40d992774a9302f05df SHA512 cb6b4cc2bc8c825de2d7073f3e874d98860bba8b0aad1f042f5069516733995faa713a6ea85907770f42df0204a55b1745da2a142b6f272f6b482d55533189fc WHIRLPOOL d8e727759ace5e110fcf146bfe1df54f1abaab797465485d012bad537a9550404885a107beab02f8e78aa9e317a47ac1178e03fcab03a83be72e889414db1ce4
+AUX evolution-data-server-2.32.3-imap-move.patch 2647 SHA256 8effa465fc2913f22f030d66f9726a6e9dcf327f7abbf1774b1bfb9f4cc1c40f SHA512 f3def00fcf4b392b1e4f9c5d222897ea5f0f767557d7a790f72bab76c994332c273d27af509d5037519b872dffacd85a8cf204a4c2b2b38b3fc68719a3346c3c WHIRLPOOL c9428f28c92c24522fa46f572e030435ef807aea049186c3e20b300c1948521b08f2f88b6b22fa7567d14929eed7332ba3e8d923cda0a64b9655921d2372f716
+AUX evolution-data-server-3.2.2-g_thread_init.patch 5340 SHA256 9587183cc7ca99a50ffd26236dee333e82954c07047fc1738f0f895963476328 SHA512 5b180a0808932463458c42f2a5b85e05a78f01a83ef16b6ecc7e0329ca06e11d6f77e1f98dfc4a7b36ef7b98534bef8d0233d3e261d953f9d26a20886d3a924e WHIRLPOOL f8f8b03e1e56297d15980edc0712e4d7473178105de07b614b263648ef71306bb75124110fb562fdaed60b86143b8cd076f006be29bbb96939a5a7c88daa6951
+AUX evolution-data-server-3.2.2-gmodule-explicit.patch 2035 SHA256 2930f89bb6b0863150844fa827fbaff9d189d33d48f618f13cc7d92d10e0690e SHA512 1235bfb2292bdc6d815b5418fbcf4c1036080e191e8535acb643f7082af2fd8f95a57c64d6bc5f73dcb1163315ec0d4ed5902a30e2380424806b0abbaf648a4d WHIRLPOOL fc5ea1bbcdd8a7b1a1771077302968a204b9de964c585b585efc2ea7abf5f0c4f34c466bb615cd3e4b584c65eb5e178f71bbb77e5396df4f69a20406c4992d14
+AUX evolution-data-server-3.2.3-caldav-cannot-modify.patch 875 SHA256 d6f73c19347081f1927282d4c672146207c5c092a87b90d2604fed6405f87ed1 SHA512 d8340074661fe49f2b1b201f71fe81d10217398761d3d87458372697dca7bd0a0ac7b550717e1acf4e6079a8ffeb2485257732c3a606c5c5901b8f24355201e7 WHIRLPOOL 613d6b19d95727d7e0abd8ab64d5bf04b166ff613345e0d1965db339e10d11da407e904a085a9cb01f71718bb6492c3cbd0097507599e2fad59a3fd46e4510d4
+AUX evolution-data-server-3.2.3-google-calendar.patch 4374 SHA256 e0d13a6f81b67ddf8ed6655c5f725c00d560c8bf3f7a56510aad2881fac56308 SHA512 c7383c9cfcdfd09487fac65a889a685121f63cf42bd49ddcb66184498209179be87056961301f28adc5339932822db6b9ddbd7b33ffb4451473bc9bdca271863 WHIRLPOOL 030fad623abbb56ce483175dba2a1b93b59e0f83cf785e4dc1692e7a6a8a8b171cc4e0e8144a80fbe5d903b8ffc52e7eeff546f78ae5700d6b479b42d391ac09
+AUX fix_relink_command.pl 4074 SHA256 f6da0e687f7e64eab82671def4b7445602d1bf64e9b56c3c188d43fadc7dabc2 SHA512 bb6d512f00e976c708395d9552aaa30afab17ad09c04e57488a11505565542396f450d9121c6ff0d8becca84778ade24873a39fcc785aa62e523fc038f1fe054 WHIRLPOOL e94d4b6c51936b9184401cf36f7cf108cbec2f806bf0a4660289cdd7ebe8a370bb396f77d9cb9d463c741eeaacb655c7771f113b0a79f7b429b4569d1e28e43a
+DIST evolution-data-server-2.32.3-patches.tar.xz 24072 SHA256 7b1f29fad87a7e868736380c69880a29ddf5d4bd365734df53042e4bc9e8b0fa SHA512 20e12257e7153d074f20c158fc16a5a8feed8e9ed34035c6d752e31ca5b21436e08d767433aa16b885ad0aa8a95b18b41f79c80f2b30db42a5af402082882d55 WHIRLPOOL 660000ccaa0160325b92cf26ea031c96190645ce4bd2a6fc83b03411c6a2bb7f7aadc0ca0a493e1ff386fd4ac4471035af2da0decb436db7f8cf74b792ac4bd2
+DIST evolution-data-server-2.32.3.tar.bz2 4322281 SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c SHA512 863ccea7717a7fe743155513e74fc8ea35f558702bd4ff1075e15d1a36c1ecd9d5e285bd2a81245d680c05cf0521029583134b4e1d12668244042df3f5e62dfb WHIRLPOOL 3c56210f477901c3ea2d4712e631d219969cb113ff1c4cba3fcefccb67fed363a6207025b46922b9c1f6ba3427b962b5e0565c6b1441249c74b29afa314e3580
+DIST evolution-data-server-3.2.3.tar.xz 3729592 SHA256 8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c
+DIST evolution-data-server-3.4.3.tar.xz 3645752 SHA256 455d0ee5ba5f1638f593476427697c9b5fc9668389b18f170449710f711626d8
+EBUILD evolution-data-server-2.32.3-r1.ebuild 4669 SHA256 b617dd397ebf949c4947a2072e6b2e1236a99efe3fcc40a8831ae74be3eaabb9 SHA512 96b98bca18abd07e3a8e8dca3919d35d5b9387c9476a91fe8823ecfdb74e1fba6aed666783d929c6e213dafa2cfb4bcbb7ff0739fe8b47d42b9e57140404dd63 WHIRLPOOL d5415a035ed210c2100a663caa5e69d363499cf2853d45832735eb5e66117e86cc8c018fa1c0f1e6a82c701f1148ea908064e686d4921df8c74feb30c47ae5b5
+EBUILD evolution-data-server-2.32.3-r2.ebuild 4942 SHA256 090de6aef78c814eaf225646d3bc3f8c2e1bf5fe01f4045b9ea09966fcd65256 SHA512 c433b1d9716b29c2e77cc5239131b3fdf642b50c28801c626b2f1eb003aff9e5f3ed679719ddf1d18040e136ceeb2a713799207e496c7d7065b3f84c6d637775 WHIRLPOOL 4ca5c463033926bf1b1e6af2de8fdba9e9a32468e04b879cb907bf1ac311740e9e37d1b4114bf582ade0d39b90dd0f5582d1fe556e37a848012a7402dc845b67
+EBUILD evolution-data-server-3.2.3-r2.ebuild 4649 SHA256 01a10190b9775c9ec00a77f742445e0dfeb74cfafb25ede6215bc2686792b590 SHA512 761e62e4928454e2c7690d4e608e9f0c5a2323df90f119829c9b3e3dd4283491592fe59fb81a4fd29695b18834cde617f666875f395b812ced06f45252067214 WHIRLPOOL e8ea623c143bb03984ccc080b825a32a0c8496011e14e6e213cbcd7c2837dd01379734242e206511bbf9fe41374459e63118ea9b73adf6121ef8a9055bf89de6
+EBUILD evolution-data-server-3.4.3.ebuild 3997 SHA256 a429dfb1f54f51e3d225aecdd30ce7a7416b1ec562afd1bbf2bad0693c8b213c SHA512 ed7cd401a13639735977f34b800a6f10bd9d71f2f20a8d260b7a7f59e6098c2e56e7bfcab40a1983704952ad2645d0550ef2028635cae0b5e6ca28beb0d8efae WHIRLPOOL 22f2b12d441b4de47c7717b9c5c0009592f01ff19476af7afa747bd7e08f5bee9f9026aef4cc5259d206f7a97aa782be1620d1b3613e1153bb3043ab93bb01fe
+MISC ChangeLog 66792 SHA256 3d067bc52836ca1069c7e300c8dd38722fcd1d104f6fee43ca6d10dbb2780872 SHA512 480d89ca3b3e53b4755e2539ea7df82395d767a1f809dfd519b4ec52b0225f572538fe67f48f39970104ddb6823a9aa17dd979b6af8793a7b887156e54e5a9ef WHIRLPOOL afe9a311458295921a4037205ae78b98db835ef52fdf4291d4ba875038d1b377ca7bf086bb99d97734ae68ac6b41ef440339f57c52a37eccdb6a7d4e2ef80cad
+MISC metadata.xml 535 SHA256 f458f1517ae769596f0dab7860b2789867e773eb32ad7cc00279dc7e2e82d64c SHA512 38aceea7cd19077688d45c10e16d935761a1913bc0d60a917e0e4cc11926959ec2154e08ffd903bc560d16c9e97c723d590d082e2e1a9a3dfc7ecc4e74fb7131 WHIRLPOOL 99ee5c5b8639e9a74f98878fe3b81985eb5f023e1b4f12c9e12a66e21d0e7f266faaedae6b086ef4603f3d53fc9aff0f0a5a3669a27179bfac07c2b495577114
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP5tOOAAoJEO/kOhxWD91kd3YQALhMaVLqIEeT8a8j4wpgEXTL
-o0XrA7Y6gAzxzNH7xO5y8yMWEV6tQ/Yxxnhh8KwYB3LNtD49Thl1MhvHAM7dIRjd
-TA1HW/VXISiZxbbMOy8rOlyEkMvbUzt6S1ZILnk534ORbLJ9UkUZEKDiW+XUvYDA
-scjCT5T1aVHl3Fe+A+8drDS0XaDX8q5eLzPaUdpooAwSZxCmM90IMlPm9YjmGVuG
-xXW7qAYsY/yib9G2JcUp3LVKZfXSueT+Q8OYZL/F/HAiBcAlX5xWN28WfWyvC5de
-K/E8Wg7aufphZMExFh3A9Ql8mAATRSQYTw0qTiA1R14eSiLZXS4PY+onGbSu+0wj
-P7I10jDVWJ3Gt+IRekU2NzcYH0HPqLhRA5c4m+H9kM3Qferm4bdSLbcPD+HhqKuM
-cPF93Mz3EvEIqaUXgGmlMGdWGahQsWxuWYZ18OycjZJbmL4hIzTjhb5xU6JfYzOc
-7stYiTUC6IGAKBZTGR5H9UFMvyqmBmPmY2qVOX4NrekY6iqs+EIubAdB5hBDybCI
-/tei608tYb7z3R1eoTGlNShQAq4qgHik/jqaoYaNjinfhgJ40xkm1dR0OvM/8LAz
-Sw98ep4KDM1j49lMbts4zF9TB4I3kFaAGyLlGMoaGYBNtbbSirY1I+KpKWWPUis5
-pgLWX1kex27hrw4a18fA
-=ZKq9
+iEYEARECAAYFAk/5b1sACgkQCaWpQKGI+9TNBgCfaAhyw2DFWSIYTkYo4OZo7oi3
+u/gAmQFC5yXocMSbjy6QwU9z9VPWflHi
+=uIID
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
index f17f1531e5fa..c11631440069 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild,v 1.9 2012/05/24 13:53:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild,v 1.10 2012/07/08 11:30:29 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 GNOME_TARBALL_SUFFIX="bz2"
+WANT_AUTOMAKE="1.11"
 
 inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
 
@@ -104,7 +105,8 @@ src_prepare() {
 	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
 		-i configure.ac configure || die "sed 3 failed"
 
-	intltoolize --force --copy --automake || die "intltoolize failed"
+	sed -e "/AM_INIT_AUTOMAKE/s/-Werror//" -i configure.ac || die
+
 	eautoreconf
 	gnome2_src_prepare
 }
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r1.ebuild
deleted file mode 100644
index 32849a8791ce..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r1.ebuild,v 1.2 2012/05/05 06:25:24 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 BSD DB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
-
-# GNOME3: How do we slot libedataserverui-3.0.so?
-# Also, libedata-cal-1.2.so and libecal-1.2.so use gtk-3, but aren't slotted
-RDEPEND=">=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3.0:3
-	>=gnome-base/gconf-2
-	>=dev-db/sqlite-3.5
-	>=dev-libs/libgdata-0.9.1
-	>=gnome-base/gnome-keyring-2.20.1
-	>=dev-libs/libical-0.43
-	>=net-libs/libsoup-2.31.2:2.4
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4
-	>=dev-libs/nss-3.9
-	>=sys-libs/db-4
-	sys-libs/zlib
-	virtual/libiconv
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.1.1
-		>=net-libs/liboauth-0.9.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2 )
-	weather? ( >=dev-libs/libgweather-2.90.0:2 )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/gperf
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.5
-	sys-devel/bison
-	>=gnome-base/gnome-common-2
-	>=dev-util/gtk-doc-am-1.9
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1.9 )
-	vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-#	>=dev-util/gtk-doc-am-1.9
-
-REQUIRED_USE="vala? ( introspection )"
-
-# FIXME
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="ChangeLog MAINTAINERS NEWS TODO"
-	# Uh, what to do about dbus-call-timeout ?
-	# Fails to build with --disable-ssl; bug #392679, https://bugzilla.gnome.org/show_bug.cgi?id=642984
-	G2CONF="${G2CONF}
-		VALAC=$(type -P valac-0.14)
-		VAPIGEN=$(type -P vapigen-0.14)
-		$(use_enable gnome-online-accounts goa)
-		$(use_enable introspection)
-		$(use_enable ipv6)
-		$(use_with kerberos krb5 ${EPREFIX}/usr)
-		$(use_with ldap openldap)
-		$(use_enable vala vala-bindings)
-		$(use_enable weather)
-		--enable-calendar
-		--enable-largefile
-		--enable-nntp
-		--enable-ssl
-		--enable-smime
-		--with-libdb=${EPREFIX}/usr"
-}
-
-src_prepare() {
-	# fix linking with glib-2.31, bug #395777
-	epatch "${FILESDIR}/${PN}-3.2.2-gmodule-explicit.patch"
-	epatch "${FILESDIR}/${PN}-3.2.2-g_thread_init.patch"
-	# fix caldav quoting problems with libical-0.48, bug #405647
-	epatch "${FILESDIR}/${P}-caldav-cannot-modify.patch"
-
-	eautoreconf
-
-	gnome2_src_prepare
-
-	# GNOME bug 611353 (skips failing test atm)
-	# XXX: uncomment when there's a proper fix
-	#epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
-
-	# GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
-	#sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
-	#	-i addressbook/tests/Makefile.{am,in} \
-	#	|| die "failing test sed 1 failed"
-
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-}
-
-src_install() {
-	# Prevent this evolution-data-server from linking to libs in the installed
-	# evolution-data-server libraries by adding -L arguments for build dirs to
-	# every .la file's relink_command field, forcing libtool to look there
-	# first during relinking. This will mangle the .la files installed by
-	# make install, but we don't care because we will be punting them anyway.
-	perl "${FILESDIR}/fix_relink_command.pl" . ||
-		die "fix_relink_command.pl failed"
-	gnome2_src_install
-
-	if use ldap; then
-		MY_MAJORV=$(get_version_component_range 1-2)
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema || die "doins failed"
-		dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	export XDG_DATA_HOME="${T}"
-	unset DISPLAY
-	Xemake check || die "Tests failed."
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use ldap; then
-		elog ""
-		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
-	fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.4.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.4.1.ebuild
deleted file mode 100644
index 768ff3b140d1..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.4.1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.4.1.ebuild,v 1.1 2012/05/07 05:58:06 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit db-use eutils flag-o-matic gnome2 versionator virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 BSD DB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
-
-RDEPEND=">=dev-libs/glib-2.30:2
-	>=x11-libs/gtk+-3.2:3
-	>=gnome-base/gconf-2
-	>=dev-db/sqlite-3.5
-	>=dev-libs/libgdata-0.10
-	>=gnome-base/gnome-keyring-2.20.1
-	>=dev-libs/dbus-glib-0.6
-	>=dev-libs/libical-0.43
-	>=net-libs/libsoup-2.31.2:2.4
-	>=dev-libs/libxml2-2
-	>=sys-libs/db-4
-	>=dev-libs/nspr-4.4
-	>=dev-libs/nss-3.9
-
-	sys-libs/zlib
-	virtual/libiconv
-
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.1.1
-		>=net-libs/liboauth-0.9.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2 )
-	weather? ( >=dev-libs/libgweather-2.90.0:2 )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/gperf
-	>=dev-util/intltool-0.35.5
-	sys-devel/bison
-	>=gnome-base/gnome-common-2
-	>=dev-util/gtk-doc-am-1.9
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.14 )
-	vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-#	>=dev-util/gtk-doc-am-1.9
-
-REQUIRED_USE="vala? ( introspection )"
-
-# FIXME
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="ChangeLog MAINTAINERS NEWS TODO"
-	# Uh, what to do about dbus-call-timeout ?
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		VALAC=$(type -P valac-0.14)
-		VAPIGEN=$(type -P vapigen-0.14)
-		$(use_enable gnome-online-accounts goa)
-		$(use_enable introspection)
-		$(use_enable ipv6)
-		$(use_with kerberos krb5 ${EPREFIX}/usr)
-		$(use_with ldap openldap)
-		$(use_enable vala vala-bindings)
-		$(use_enable weather)
-		--enable-nntp
-		--enable-largefile
-		--enable-smime
-		--with-libdb=${EPREFIX}/usr"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# GNOME bug 611353 (skips failing test atm)
-	# XXX: uncomment when there's a proper fix
-	#epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
-
-	# GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
-	#sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
-	#	-i addressbook/tests/Makefile.{am,in} \
-	#	|| die "failing test sed 1 failed"
-
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	# FIXME: Fix compilation flags crazyness
-	# Touch configure.ac if doing eautoreconf
-	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "sed failed"
-}
-
-src_install() {
-	# Prevent this evolution-data-server from linking to libs in the installed
-	# evolution-data-server libraries by adding -L arguments for build dirs to
-	# every .la file's relink_command field, forcing libtool to look there
-	# first during relinking. This will mangle the .la files installed by
-	# make install, but we don't care because we will be punting them anyway.
-	perl "${FILESDIR}/fix_relink_command.pl" . ||
-		die "fix_relink_command.pl failed"
-	gnome2_src_install
-
-	if use ldap; then
-		MY_MAJORV=$(get_version_component_range 1-2)
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema || die "doins failed"
-		dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	export XDG_DATA_HOME="${T}"
-	unset DISPLAY
-	Xemake check || die "Tests failed."
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use ldap; then
-		elog ""
-		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
-	fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.4.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.4.2.ebuild
deleted file mode 100644
index 22304defed4d..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.4.2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.4.2.ebuild,v 1.1 2012/05/20 10:44:45 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit db-use eutils flag-o-matic gnome2 versionator virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 BSD DB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
-
-RDEPEND=">=dev-libs/glib-2.30:2
-	>=x11-libs/gtk+-3.2:3
-	>=gnome-base/gconf-2
-	>=dev-db/sqlite-3.5
-	>=dev-libs/libgdata-0.10
-	>=gnome-base/gnome-keyring-2.20.1
-	>=dev-libs/dbus-glib-0.6
-	>=dev-libs/libical-0.43
-	>=net-libs/libsoup-2.31.2:2.4
-	>=dev-libs/libxml2-2
-	>=sys-libs/db-4
-	>=dev-libs/nspr-4.4
-	>=dev-libs/nss-3.9
-
-	sys-libs/zlib
-	virtual/libiconv
-
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.1.1
-		>=net-libs/liboauth-0.9.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2 )
-	weather? ( >=dev-libs/libgweather-2.90.0:2 )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/gperf
-	>=dev-util/intltool-0.35.5
-	sys-devel/bison
-	>=gnome-base/gnome-common-2
-	>=dev-util/gtk-doc-am-1.9
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.14 )
-	vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-#	>=dev-util/gtk-doc-am-1.9
-
-REQUIRED_USE="vala? ( introspection )"
-
-# FIXME
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="ChangeLog MAINTAINERS NEWS TODO"
-	# Uh, what to do about dbus-call-timeout ?
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		VALAC=$(type -P valac-0.14)
-		VAPIGEN=$(type -P vapigen-0.14)
-		$(use_enable gnome-online-accounts goa)
-		$(use_enable introspection)
-		$(use_enable ipv6)
-		$(use_with kerberos krb5 ${EPREFIX}/usr)
-		$(use_with ldap openldap)
-		$(use_enable vala vala-bindings)
-		$(use_enable weather)
-		--enable-nntp
-		--enable-largefile
-		--enable-smime
-		--with-libdb=${EPREFIX}/usr"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# GNOME bug 611353 (skips failing test atm)
-	# XXX: uncomment when there's a proper fix
-	#epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
-
-	# GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
-	#sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
-	#	-i addressbook/tests/Makefile.{am,in} \
-	#	|| die "failing test sed 1 failed"
-
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	# FIXME: Fix compilation flags crazyness
-	# Touch configure.ac if doing eautoreconf
-	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "sed failed"
-}
-
-src_install() {
-	# Prevent this evolution-data-server from linking to libs in the installed
-	# evolution-data-server libraries by adding -L arguments for build dirs to
-	# every .la file's relink_command field, forcing libtool to look there
-	# first during relinking. This will mangle the .la files installed by
-	# make install, but we don't care because we will be punting them anyway.
-	perl "${FILESDIR}/fix_relink_command.pl" . ||
-		die "fix_relink_command.pl failed"
-	gnome2_src_install
-
-	if use ldap; then
-		MY_MAJORV=$(get_version_component_range 1-2)
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema || die "doins failed"
-		dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	export XDG_DATA_HOME="${T}"
-	unset DISPLAY
-	Xemake check || die "Tests failed."
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use ldap; then
-		elog ""
-		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
-	fi
-}