Depend on libsoup-gnome again, clean up old revisions.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

11 files changed, 37 insertions, 181 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index ee19af98b46b..90d1f5061b64 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.239 2013/07/04 20:11:49 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.240 2013/08/30 22:44:14 eva Exp $
+
+  30 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org> claws-mail-3.9.1.ebuild,
+  claws-mail-3.9.1-r1.ebuild, claws-mail-3.9.2.ebuild:
+  Depend on libsoup-gnome again, clean up old revisions.
 
 *claws-mail-3.9.2 (04 Jul 2013)
 
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index d60dd56f4dd1..b54131fd14f6 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -10,15 +10,15 @@ DIST claws-mail-3.9.1.tar.bz2 9367489 SHA256 376e535aac746dccbd8871c6f3ff6ced301
 DIST claws-mail-3.9.2.tar.bz2 9413758 SHA256 e396cb67e8ecdae926dfcd59da4b3f26a633aabc0f4f00b1f24cb207f3ff2330 SHA512 8703c170b7e66fb42e8fe41ec86997edc56c9c0da92ac5482d6432159ea46d53aec414097f0c796abee5cb4402bfaa55b194f36c21d5453ab97ea140a2093240 WHIRLPOOL 0c56081cbd073e532725afc3c3714f28b6f1a9adcc835e421deb7db6814b634f26e8e95d42a832d0fdcd7b7b3824a03b66cb7d6951ffe9bf4ef10bb777bb4777
 EBUILD claws-mail-3.9.0-r1.ebuild 3891 SHA256 afbf9936083e3cc38bb16cfc959cbada2a38aa437b4fbc6df2ef1af1cea37fe5 SHA512 161364a5c8f510ecf39538b653763d09a24906bc2a527a10c28cf301b14d6744bf065bc4cf510213489afe41168eadcafd6006e270c338b0f1f8a4e9e4845c7b WHIRLPOOL 98c86442d1d29dd1800a819d6a854207b72f266058b2f024122f73c82a9d219ef9dec34de4a6517194cbeda4d8c1cfccff15dd8b9d00a0b858c7ae8b771c17d8
 EBUILD claws-mail-3.9.0.ebuild 3753 SHA256 da894e3b689fe452e0c9ba8c52153bd84c85163ccb44131c266fd84493336444 SHA512 e20a44a61d6c89552a89d81a43d469627a875aaaea2ced5cefa9a05a1798dde286f7d262a0e5e062a761f71b6d1c5dbd306a9aafbf067e5826acd3ec7962b417 WHIRLPOOL e1f688bf43bebba383d50dc05a57eed41e6ef9e198a4b80e4626ac362c870cb2574fcadd3170f1880f77effb0a99a84177f3a3e5976920e132dd3ff6dc6d60a9
-EBUILD claws-mail-3.9.1-r1.ebuild 6537 SHA256 3a8af84892acec03b613a1744d1da0c181c3e87d2edb16a8f6f09c48d313a785 SHA512 7e44459d83ee487b931951795e5415613b496944eeedd03f0fdf4a0c2a8eab935394ae7543891769eb5801766ce9bc620744c6869683fa3c94558c5c6060da34 WHIRLPOOL fb44d076fd3625811ba869a4b37f09f3f96e02ad26f2c741caa9e6c0f91b5d6cca687fb8964ab175e80106f9d7008bbbed742ee073e9f3e78089d3683bffdf76
-EBUILD claws-mail-3.9.1.ebuild 6494 SHA256 23671d2efcc24c119aea68fd318142e2fc167b3f993b59569ddd3b25cbdad9e4 SHA512 1640e0598c73ea39195cc4f01174ead10220fc388b4d4044b26e778b150563c6ba15bfd8fbb34f55ed38d6c35d3df06ff550b2e9381335283c46c0e0ff1f2fee WHIRLPOOL 71da07e9d26254052666c421aca8a303cac32674cdb548bdc696149226d2a1bc4ac1e9b25ae24282c8bd356132ebe4eb0bad196b93ede98545cc01824924c7a4
-EBUILD claws-mail-3.9.2.ebuild 6436 SHA256 d9c5f33416e69801a9fd093fbeff7b527ef9501d1ae721774fbd1e2a4df19968 SHA512 f9bb7ff5b036c709a057b569b0bb9526444cf1a55ef5ba87e49aab967b5cb3fc03a171c6618782f0b0d9dab83637abf6a2b1745c5e52cf5996add1952aadef75 WHIRLPOOL efabb909a3c3bff16b1eb1a1d45a7f5ec4c760852d5177c9c197bd8d66b0dfe70242e156aaf444e41f89691229162eec66d6376ecffd1912809ff8e39cca46fd
-MISC ChangeLog 48722 SHA256 7d1447c0a82e6816a8046213a3347f13c42283584d788427af4db8bfdc664dba SHA512 4031f61868131b9eae1c17590ffcd28694201df6659c828480dda177b124bd56c56c3b6e710d6f4dbfc6f049d5e3be68f713e701e1e4ce18659b8fdf217d3d49 WHIRLPOOL 96fd47365025771d8fb0276a5f5e3923ae74a90ca271a3e692d02b1e7d39904f242cdc6ab62daf2a199b6a4d8b004063e5f9d4623a9c6fa3000814fe37efa674
+EBUILD claws-mail-3.9.1-r1.ebuild 6497 SHA256 ae9f764746fc21667392d5d0791f412f5c24d169c607c5a3ffcee49ae15ea5cc SHA512 89a43234688d196f2cafdc80655ec58c9da53961c95654194439b9f233454545418f9c108834ea715191de5238ea918516c18b2460b3997c20af5debd05bcc60 WHIRLPOOL b84efb301e90ba90b521f70a133ab6af488d2e5ec96ff860220b53aa18971782039f5e76baf1b45dca1403b1908def234ca2867168861e02ea0b8f5eb65e90ff
+EBUILD claws-mail-3.9.1.ebuild 6453 SHA256 ff0f4a92a8adc0b7df3b86d97954480cf67e56b5bf89c8694bb1a5a1e1788191 SHA512 2a15a22c23ea8860512c687bb32ea724d6d4d98b573610dc0beef58f9f99c876e04eec2671cd7eba75c057366b3c55400717df4c26dd1c26b780e5cc418a797a WHIRLPOOL 1cc6082ff8ae363fd6c7bbcfe9481db2ebcbf1a6527c9b25618571de018bf0a2966aeeb99b8ad631e8dac701c0141454f3d63f59f7b2755837762eb42f348e7b
+EBUILD claws-mail-3.9.2.ebuild 6396 SHA256 964d0d9793c9dfe75063454f06962aaf1657a738eee08c97d1345d4c804f8ae4 SHA512 7fcec99e94f18618494c157824447ec66d1a90ab35c488c6b22acb5e2cf393f890caefa31f4535c48bf86a53e3624ea6fa7d43df88463ab706f2eff48d1209d2 WHIRLPOOL fc2f7d32db405ec09689bf082c00b3e2b8d732730e47affa0ff5a3e0063e34c9a7260d16324888b8f98f4f4c2156236f009dd7d73403199763146158af66a4bb
+MISC ChangeLog 48912 SHA256 29bfa4d06f650570def482dea4969872a29792149a08a58ed8ea827fe3353adf SHA512 3e9a9524d974076d801286b994799d630ac568ce90024fff76f09b72c2d4d551a94817a1cbfc3646eba9c7de96cf65bfa757f8d31e8ff608fbc2513e547e41f0 WHIRLPOOL 62ecb6033f7f813e5e4c7f82296f79694491ec797a66798c410018ef94fe3abbe9cbd5545aa1a3f41e1416bcde4ce219362fcf47826eed5f108ff6ab1930af06
 MISC metadata.xml 1512 SHA256 9f6506ac3a742abaa867916c37fff4184837799768815a5601a530197a0e7f2a SHA512 51fd0651f330aca6619680f50377f6dab7ad05d3c0530e29ce4149c18ed72b2e4e6839cd5eac87aa3cc21d1a740cbafcd4433c6c4bd369af3acb999a52cda369 WHIRLPOOL 5f301c096c555bbc1292272d91c5ac431d7b591edb6eeefa3ba57bcdbe4307fc7a4b1861731cadd75c3453254b4df0bd4cf2dec45d98e2b6fbf1bd7270d4844c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlHV10MACgkQNQqtfCuFneOPeQCeMrHAIuOWrlYOj7s35WqZYGGU
-TM8An2sMcoPBItzeWrlZ8iB9Dy89zzyd
-=QMdz
+iEYEAREIAAYFAlIhID8ACgkQ1fmVwcYIWAbRzACeN6UUQm4No1H27gEby72vwl+R
+aXsAnRrdMCIBZC8JK2RGJL32nR6npqRv
+=8KMm
 -----END PGP SIGNATURE-----
diff --git a/mail-client/claws-mail/claws-mail-3.9.1-r1.ebuild b/mail-client/claws-mail/claws-mail-3.9.1-r1.ebuild
index 42accb28157d..b5ca7a420bca 100644
--- a/mail-client/claws-mail/claws-mail-3.9.1-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.9.1-r1.ebuild
@@ -1,6 +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/claws-mail/claws-mail-3.9.1-r1.ebuild,v 1.1 2013/05/16 03:51:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.1-r1.ebuild,v 1.2 2013/08/30 22:44:14 eva Exp $
 
 EAPI="5"
 
@@ -78,9 +78,8 @@ COMMONDEPEND=">=sys-devel/gettext-0.12.1
 	pdf? ( app-text/poppler:=[cairo] )
 	spam-report? ( >=net-misc/curl-7.9.7 )
 	webkit? ( >=net-libs/webkit-gtk-1.0:2
-		|| ( >=net-libs/libsoup-2.42:2.4
 		>=net-libs/libsoup-gnome-2.26:2.4 )
-	 )"
+"
 
 DEPEND="${PLUGINBLOCK}
 	${COMMONDEPEND}
diff --git a/mail-client/claws-mail/claws-mail-3.9.1.ebuild b/mail-client/claws-mail/claws-mail-3.9.1.ebuild
index 87b746c01813..8335374745cc 100644
--- a/mail-client/claws-mail/claws-mail-3.9.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.9.1.ebuild
@@ -1,6 +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/claws-mail/claws-mail-3.9.1.ebuild,v 1.10 2013/05/14 18:21:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.1.ebuild,v 1.11 2013/08/30 22:44:14 eva Exp $
 
 EAPI="5"
 
@@ -78,9 +78,8 @@ COMMONDEPEND=">=sys-devel/gettext-0.12.1
 	pdf? ( app-text/poppler:=[cairo] )
 	spam-report? ( >=net-misc/curl-7.9.7 )
 	webkit? ( >=net-libs/webkit-gtk-1.0:2
-		|| ( >=net-libs/libsoup-2.42:2.4
 		>=net-libs/libsoup-gnome-2.26:2.4 )
-	 )"
+"
 
 DEPEND="${PLUGINBLOCK}
 	${COMMONDEPEND}
diff --git a/mail-client/claws-mail/claws-mail-3.9.2.ebuild b/mail-client/claws-mail/claws-mail-3.9.2.ebuild
index ecf991a9cc91..b62dd155727c 100644
--- a/mail-client/claws-mail/claws-mail-3.9.2.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.9.2.ebuild
@@ -1,6 +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/claws-mail/claws-mail-3.9.2.ebuild,v 1.1 2013/07/04 20:11:49 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.2.ebuild,v 1.2 2013/08/30 22:44:14 eva Exp $
 
 EAPI="5"
 
@@ -78,9 +78,8 @@ COMMONDEPEND=">=sys-devel/gettext-0.12.1
 	pdf? ( app-text/poppler:=[cairo] )
 	spam-report? ( >=net-misc/curl-7.9.7 )
 	webkit? ( >=net-libs/webkit-gtk-1.0:2
-		|| ( >=net-libs/libsoup-2.42:2.4
 		>=net-libs/libsoup-gnome-2.26:2.4 )
-	 )"
+"
 
 DEPEND="${PLUGINBLOCK}
 	${COMMONDEPEND}
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 4fc26bad0c71..5899695c0a67 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.404 2013/08/25 18:55:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.405 2013/08/30 22:49:16 eva Exp $
+
+  30 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org> evolution-3.6.4.ebuild,
+  -evolution-3.8.4.ebuild, evolution-3.8.4-r1.ebuild, evolution-3.8.5.ebuild:
+  Depend on libsoup-gnome again, clean up old revisions.
 
 *evolution-3.8.5 (25 Aug 2013)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 380ca0c80b3f..c130ece1c3d4 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -16,16 +16,15 @@ DIST evolution-3.6.4.tar.xz 12401324 SHA256 7bf7054d85b7d1bd0e62d69f15ef80dbe781
 DIST evolution-3.8.4.tar.xz 12324844 SHA256 d5cfd0cb68ed8bf6e9515a5a44f566e3d26d3813a22ee6e5b0f86029039b1766 SHA512 3d074ad1678067a673ff715090b9543c4a108ff571d28c08e10936d4572648327dc1d6cd5d0eb10133202a589e407e8e9c535247921c699792899ceabeaa678b WHIRLPOOL 15cad220f5a130ff1a95c10492b07c3aec82f82c9f5948b9e8b8f8593496aa17e46bd505641d002a1611d16d2c575cb959c1776c91d7b9896cea536489251598
 DIST evolution-3.8.5.tar.xz 12325444 SHA256 26ef047425826a7672f0db7f3d4eef908e68bae47a9e0756883079c445e4326d SHA512 d0b12f587a210754f108db7f1e43e2d8be8e7c0c5dd5a708ccae66989c1043501a7d5be3cbb9ef283a95c430fa06ee957fbf30c8e941bb0fa414cbc4e46d7606 WHIRLPOOL f25ce768fede4acd2f65e4ff32490eb70634056314a52edc13ceca38c6a83b1f0ae5d11b66c79e61562794e5ee2a61f071ce42b6e9a2b218fc57f8a7c1bb129d
 EBUILD evolution-2.32.3-r1.ebuild 6164 SHA256 eccfbb24f84fdee7528af0973e475f92e7049b85e59bfbbcc4e58b67747e8e49 SHA512 4f84b8ab0e6188a4162199d7ed1e319702f2831cb1907452d7d02b82e5eaf19f439d99e39f05852ff81ffcdd75b6da5036c04e3d177afd45bdb475ad4ec5de33 WHIRLPOOL 95416087ca1f2677f145d2bbabfb2c6d4d7a0497d03d0fa76aa7a1d5abadb0136d796a7c6c5048745c4fb33448dea5fd744b8eda22a0a7e2b99c5076a0c5401c
-EBUILD evolution-3.6.4.ebuild 4808 SHA256 e837f9e98a03f439e51ac8008556162b1afa08ae4e3721e038b8b42843bf24ac SHA512 14261f40501d3bce54c619dba3312ffa06f3bf7c84ace06e6b76952349bf999596eb40f9260e0523c25f92a238c4547c641de04aa150496b081186a756cde55c WHIRLPOOL 51e1750f0f18bf0de00264965724c3f483e7bedb2c24b2bb2d64777341391eaab2213bf8d8898c9910bb9bcb34d58f3c2fe37f6c1210e98a3769fe87c03733cc
-EBUILD evolution-3.8.4-r1.ebuild 4606 SHA256 930f68fbb876a9e73a6a227fb5c143a18866c74b6475ecc5074b019157c23795 SHA512 11e5455938724d48e5a61226b040318923345856640f0a30cd8ce219df00bd23b95691d714442f687d3346f78079821e2a03f63a52f20e02e35fbefaa7a6d106 WHIRLPOOL be54bb490c5a201ab2ff5c910acc36bb28480fec34d22d0c2fe2c6bd4c35b96341ac2f50d3c8124e5f80a4c7bef15e06197018f7afac5921cfa64386567b3f9c
-EBUILD evolution-3.8.4.ebuild 4491 SHA256 33e548fd105f850ed2a891f95f290badec992f954886fb8bf43665a0e1a82186 SHA512 f5faa878a9dc48e96a752e8ac117d5563beec2055b60cfb2a0dc9289d5da62e7cede6c76c744da21167b7a1708b6d3bb3173ef0b8b867b9fa54a5091963b11e2 WHIRLPOOL d5bcc1dbcf8e5a6a2751473baa05b0955cba749fa6291bdad5e6fb8501d3ed0c4edfdd33ff195ab2e4e7dfc22803c84eb829d1be11e2bb7ee4816a6bd617fdd8
-EBUILD evolution-3.8.5.ebuild 4479 SHA256 63a61db2fbdfad448e0d53aebdad92475b22bb38a2c03c481c92c7e4d5c5a94c SHA512 0ce359dea177eb766a49bf62802eb233d134d6befc1e810b4477fcd7226e696ac40cf584ff5bb89d99d637f9e3dc5c9a440e5928d491502df956c71d2974b19c WHIRLPOOL 825500118cd6f86af8c0ece762e994e78a5154a93055cf63c90ea51cbb14e7fffe280f060d2d815e9866d92416c0cfaebcfe94118edc8f2fd3da309de5165f51
-MISC ChangeLog 89547 SHA256 27fa224712b63402f7d79825c9540a890769558f3ad5d4fa0763d6f26581577c SHA512 ae1647e8f2da1ad328b74c20ed7e4b8074e21bc49b826a4c9993133a0cee4184ac4b3462feef5c0e0119a81ed92a835b3da770755c6e16e9fb98e69ea48f66db WHIRLPOOL 4f4ab65897e44977dd14f9cd269cbfbe0ed1872d77c401087ae4d2259c69dea154fd9321f6cd62bbaa6a3a4e297482bf81b47794fc20ceb5e5a1912b7de1a94c
+EBUILD evolution-3.6.4.ebuild 4769 SHA256 8f4d81f1a149aa406a500051e7fc908325be4e3c46a58c0b7e9931b928883208 SHA512 83c9e9e3892becae4cd811baf47883a114f30f1fa8691e97c9ee6417992dfa8b4fb9fd0c14ccad8a2b6d513a123f90cffa35dee4d38ff1ed1a0e807e4492f68d WHIRLPOOL d94c9afef1d9eb41c97ea71c34ca195702669200b0b1b9ad425f14263ec04ca4702380e4d6bc9045f442f9bf35ff327148192fba77c0db6e30d5163a084ccd67
+EBUILD evolution-3.8.4-r1.ebuild 4569 SHA256 c051774dfd876777197c00f97a3e9c2e0b1c6eb01f47010e151b104aa5251b06 SHA512 63b80902c04042f277f01df0d20a885f70f8949b069ffe37efdd015bdaaadab7bdaa60d5a9c598fdd2ae526c4c11ca5834d84bf67fd98de27ae1645b8de74b6f WHIRLPOOL 72b20fbb0136570508a8af2230601eccc0b7f19832798db4e5330d6e2a6ebf5d1b9dfa8bdbd5433d55bc4a0c70695ab535fa61a137d7798bb394d43784882965
+EBUILD evolution-3.8.5.ebuild 4444 SHA256 13f5f0d15057a51667ef357b50b1bc5fd80a08e8d1b02d3155df5305bf6df95a SHA512 405e41a99a68011b69d74a1c8acc4a42b2e84410c7edd7ae76b0a2d2468768b2071e7bedf23d09f66b74bc33c1921d1caceb31efc11f8a21cc0c40dcc3d1aa1d WHIRLPOOL 14338697a5609fbbfe46bfdff9b670eb852d143767b625ea3109b07ff5bdd803d1a9395a495aaacc81535f0d60e9acfeff95e8fc1458cf24c226b91ba19542ee
+MISC ChangeLog 89761 SHA256 53607d700203ab90bbd4931608726096db489fd778f53444aa5dd0c6aeff5023 SHA512 6237428f498bc32328ccbd8726bf260cd6ffc56cc7d9d0c4e8d7d3c333c94d25e0da08ef3bf77b294b2471fbf6a122b93e881e297ee25c8b390a6aa7d1085eed WHIRLPOOL fff8d3d8725561fcf6c748fea2692ac616b102c720449fd9d2bb4d7574d2dad3ccd686cca446aded775d9d92a996833f29fbe36d596ee9ff747596ccc729e993
 MISC metadata.xml 1273 SHA256 57d501a14b07828c2c839e5fe5c97f7bcf765e507b2d1a264c104eab4819215f SHA512 856175453a5f7c376c687ed229ff0dcc9c2dd840d3b6f5c1617f58d227fdfeabe944dcc8229d2fc1fa32f698337368fe1d3e76fe6d7c841d4fe68a5afbe8db8c WHIRLPOOL ef128b4d25b0e2b02cfd76105409e60ca2fa0ca89ccf1c08f088e202dcc1b780452b70c6e7e5363b8157eef39785285945c796de99a09d4547c5a13ba7d9c36d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlIaU0AACgkQ1fmVwcYIWAbI0QCglpSYSK7UmgP6AHJdEDSwDuAS
-cNgAnRJ1NG9NQXFG8QuG16ZEVIbLx3rb
-=N+GP
+iEYEAREIAAYFAlIhIW0ACgkQ1fmVwcYIWAb33wCfcUfvBSKNV6TeQR6uk0SWRm6i
+I98AoNtgRYPkyjOE/1WONvcHWZ3QQv+K
+=U3x5
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-3.6.4.ebuild b/mail-client/evolution/evolution-3.6.4.ebuild
index b8ae06026b43..7c84fb118837 100644
--- a/mail-client/evolution/evolution-3.6.4.ebuild
+++ b/mail-client/evolution/evolution-3.6.4.ebuild
@@ -1,6 +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/evolution/evolution-3.6.4.ebuild,v 1.3 2013/07/28 08:31:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.6.4.ebuild,v 1.4 2013/08/30 22:49:16 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -39,9 +39,7 @@ COMMON_DEPEND="
 	dev-libs/atk
 	>=dev-libs/dbus-glib-0.6
 	>=dev-libs/libxml2-2.7.3:2
-	|| (
-		>=net-libs/libsoup-2.42:2.4
-		>=net-libs/libsoup-gnome-2.38.1:2.4 )
+	>=net-libs/libsoup-gnome-2.38.1:2.4
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.10:=
diff --git a/mail-client/evolution/evolution-3.8.4-r1.ebuild b/mail-client/evolution/evolution-3.8.4-r1.ebuild
index 0a3750c18022..fdd24d22cfd7 100644
--- a/mail-client/evolution/evolution-3.8.4-r1.ebuild
+++ b/mail-client/evolution/evolution-3.8.4-r1.ebuild
@@ -1,6 +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/evolution/evolution-3.8.4-r1.ebuild,v 1.2 2013/08/17 12:30:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.8.4-r1.ebuild,v 1.3 2013/08/30 22:49:16 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	dev-libs/atk
 	>=dev-libs/dbus-glib-0.6
 	>=dev-libs/libxml2-2.7.3:2
-	|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.40.3:2.4 )
+	>=net-libs/libsoup-gnome-2.40.3:2.4
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.10:=
diff --git a/mail-client/evolution/evolution-3.8.4.ebuild b/mail-client/evolution/evolution-3.8.4.ebuild
deleted file mode 100644
index d76ffa7d13df..000000000000
--- a/mail-client/evolution/evolution-3.8.4.ebuild
+++ /dev/null
@@ -1,146 +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/evolution/evolution-3.8.4.ebuild,v 1.3 2013/08/04 08:48:48 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic readme.gentoo gnome2 #autotools
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://live.gnome.org/Evolution http://projects.gnome.org/evolution/"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-IUSE="+bogofilter crypt +gnome-online-accounts gstreamer highlight kerberos ldap map spamassassin ssl +weather"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34:2
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gtk+-3.4.0:3
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=x11-libs/libnotify-0.7:=
-	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather?]
-	>=gnome-extra/gtkhtml-4.5.2:4.0
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.6
-	>=dev-libs/libxml2-2.7.3:2
-	|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.40.3:2.4 )
-	>=x11-misc/shared-mime-info-0.22
-	>=x11-themes/gnome-icon-theme-2.30.2.1
-	>=dev-libs/libgdata-0.10:=
-	>=net-libs/webkit-gtk-1.10.0:3
-
-	x11-libs/libSM
-	x11-libs/libICE
-
-	crypt? ( || (
-		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
-		=app-crypt/gnupg-1.4* ) )
-	map? (
-		>=app-misc/geoclue-0.12.0
-		>=media-libs/libchamplain-0.12:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		~sci-geosciences/geocode-glib-0.99.0
-		x11-libs/mx:1.0 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	ssl? (
-		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.5.0:2= )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#	app-text/yelp-tools
-#	>=gnome-base/gnome-common-2.12
-RDEPEND="${COMMON_DEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	highlight? ( app-text/highlight )
-	spamassassin? ( mail-filter/spamassassin )
-	!<gnome-extra/evolution-exchange-2.32
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-src_prepare() {
-	# Reason?
-	ELTCONF="--reverse-deps"
-
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-
-	#eautoreconf # See https://bugzilla.gnome.org/701904
-
-	gnome2_src_prepare
-
-	# Fix compilation flags crazyness
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "CPPFLAGS sed failed"
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
-	gnome2_src_configure \
-		--without-glade-catalog \
-		--disable-image-inline \
-		--disable-pst-import \
-		--enable-canberra \
-		$(use_enable bogofilter) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable gstreamer audio-inline) \
-		$(use_enable highlight text-highlight) \
-		$(use_enable map contact-maps) \
-		$(use_enable spamassassin) \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
-		$(use_with ldap openldap) \
-		$(usex ssl --enable-nss=yes "--without-nspr-libs
-			--without-nspr-includes
-			--without-nss-libs
-			--without-nss-includes") \
-		$(use_enable weather) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/evolution-3.8.5.ebuild b/mail-client/evolution/evolution-3.8.5.ebuild
index a17deac087e5..909c98252150 100644
--- a/mail-client/evolution/evolution-3.8.5.ebuild
+++ b/mail-client/evolution/evolution-3.8.5.ebuild
@@ -1,6 +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/evolution/evolution-3.8.5.ebuild,v 1.1 2013/08/25 18:55:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.8.5.ebuild,v 1.2 2013/08/30 22:49:16 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	dev-libs/atk
 	>=dev-libs/dbus-glib-0.6
 	>=dev-libs/libxml2-2.7.3:2
-	|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.40.3:2.4 )
+	>=net-libs/libsoup-gnome-2.40.3:2.4
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.10:=