RDEPEND on libsecret[crypt] (#491548 by Rick Harris), drop old

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

7 files changed, 16 insertions, 580 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index fb2e543c40b9..975bdede0f76 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.379 2013/09/05 19:44:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.380 2013/11/18 20:02:26 pacho Exp $
+
+  18 Nov 2013; Pacho Ramos <pacho@gentoo.org>
+  -evolution-data-server-3.6.4.ebuild, -evolution-data-server-3.8.4-r1.ebuild,
+  -evolution-data-server-3.8.4.ebuild,
+  -files/evolution-data-server-3.8.4-pop3-removal.patch,
+  evolution-data-server-3.8.5.ebuild:
+  RDEPEND on libsecret[crypt] (#491548 by Rick Harris), drop old
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org>
   evolution-data-server-3.6.4.ebuild, evolution-data-server-3.8.4-r1.ebuild,
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 29587969c212..b5f3b1284b5d 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -9,36 +9,18 @@ AUX evolution-data-server-2.32.3-gmodule-explicit.patch 2137 SHA256 cb936b70909a
 AUX evolution-data-server-2.32.3-imap-move.patch 2647 SHA256 8effa465fc2913f22f030d66f9726a6e9dcf327f7abbf1774b1bfb9f4cc1c40f SHA512 f3def00fcf4b392b1e4f9c5d222897ea5f0f767557d7a790f72bab76c994332c273d27af509d5037519b872dffacd85a8cf204a4c2b2b38b3fc68719a3346c3c WHIRLPOOL c9428f28c92c24522fa46f572e030435ef807aea049186c3e20b300c1948521b08f2f88b6b22fa7567d14929eed7332ba3e8d923cda0a64b9655921d2372f716
 AUX evolution-data-server-2.32.3-libical-0.48.patch 920 SHA256 7d38183419b479502623382252be86fabd707a8dbb1f1ff20c6e5e07207dad11 SHA512 112f1722e5ca8e763ed8a16bb73c7dd86d90e40baa50df2fe6fbc094c0db8305b4f7f057d60301626cd4c784279dfaf45aa6ede0a5ea6cdc6b236464568f0bb3 WHIRLPOOL 5192f3bceed1d17806f057849518b9e0e1ed5f482a9e111bfc6fc90aad6af96325951ced570753d4b7025f7b568cafbf85632b09184a50a58c1c5fc2b5611748
 AUX evolution-data-server-2.32.3-libxml2-2.9.patch 4438 SHA256 db65f8053098409e13a59365cbe4c6a0ae1edcfd7e850330ac0dc9edf74daf7c SHA512 e76d902e3be48324024dec5a5f3898c1d21f0900a4787df85612e557503a5f3982227f72dddfa340c11e4d1e4d0fbeca58efa75e10feb44adcf2cf9fe64b0b89 WHIRLPOOL 666e1f356ff5f5f6fb5c9c5630e88b0b4fb2af445ad7eae6838ee66154efa5d8da33cc243c59ed870196c12cf0e207e72e48049b0065af428e2ca310826e15fa
-AUX evolution-data-server-3.8.4-pop3-removal.patch 5599 SHA256 14be60b05626d09e950e4f6c9978fa69eb7a4704fee6c5867bb45ef20eb8b077 SHA512 c908dcbdc212f264d77bbd78daa1b44ab8207c2cba90a57f8cfa087da39e99342c56d56d5d875eeffd0712a5f3164d3729d4797710d178af4adc5ab84229af9d WHIRLPOOL ee3534edfdde2956c58d4877e3b08cef30a01d1eff3d79b57f0fb48c4cf9693010632012ed4fb3ec1d7eadbb875798699af234780a9c0b518555e8d57aa743df
 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.6.4.tar.xz 4079620 SHA256 50b4ca21bc57d2fe4933ea3072bf11d5e6069d0ecaacced0bd0f55f098d09f4e SHA512 01f7537f4c7b4e2d837a5bf33e70fde4bce146af809e3d437010b5b2f73164bb91f2dd04b00136a9167337d619ffcafcbb2605e3fce954a8ae317d62dafe8374 WHIRLPOOL a5c34b4e1b677149232400be98916096983a01c8ae6c55e4c7a7eb2653fca12439460158f39bdbb0e2c2a593b6a6052efe12906e0383fd867884bb65dc4472ef
-DIST evolution-data-server-3.8.4.tar.xz 3932296 SHA256 0b9e725d36a4c63ccb15b4e0f92932764c9a335e84af2ebeeb4c182760ef3f6e SHA512 fd4b54b896791186a48a7f01e66354eb02fd2ad9b452202869d9e1345b08133e952eb17677e3420469dbde425fbc347c82a40acaddba4766b84b32c42e1599cc WHIRLPOOL 95d937bc9783f1d3fd6a5637aaf837f612ef4669932cfb5f7fa21ed6e4a86dbcec7435d5c1baf0f9d2c7f4629aa27a204199a4cda608fe345869543f3621c975
 DIST evolution-data-server-3.8.5.tar.xz 3934408 SHA256 73c4ecfed65651cc72966b90081d7b72f9b42573585bc89797efea65ccfdbd2a SHA512 4786baf811e9a3c6134d499d7f2c1ab535963354f1cdcbea4baafb1f809dc53ce1d782be794e3d779499edd8b6fa64c52461b114832174a8302ee63778eebe0c WHIRLPOOL 56b668c3bfd2529bfe598c1574b1555893e4ae9d7c018680ca0c10518a628890578f9d4a0eb82cf0634fc09b9d4019f00ca91b1f68f0568709d49999cf9c11d3
 EBUILD evolution-data-server-2.32.3-r3.ebuild 5155 SHA256 131f1419171c2d7a877f7290948965dba3d3316cf24401bd48962e1e8993d661 SHA512 4340c7b1bac68b292d8a5a9c1fa51a316554d8307bdc7f2ce5cf28dfdf2c8ff58a9cecf350190359f20c39bf419931669ff8bbb540e7549f1b9c19798a10b27e WHIRLPOOL a12d27c6cc552b31c7407b1c583fd707cc01bd02ded30e5791ab26d82b6b4d8a6958846e3a2b34f91707b06f80c602e6efbb61d81d4b9a48c95758c92616cddd
-EBUILD evolution-data-server-3.6.4.ebuild 3790 SHA256 e026af0d3f87c3a05a13b21445eff26036dd9834c10b60cff66f4d88509ebb87 SHA512 4fe0def790166414b2bc83d37548740b4c795d96091838e06c98414d626cfc695a36c4920ab460cd6712546b3daae52025b2526a5386eb6135b8faa05e12ca37 WHIRLPOOL 965e1663427150a5d7e1911a9e6b0f89c856121b890965dcb5d235c4aac7a5d330b57dd7a31a8acae4a67265fd58aaa0e4e74974ff4547d4bd2fdb98a99f372f
-EBUILD evolution-data-server-3.8.4-r1.ebuild 3780 SHA256 27be806ed74587566edb6e9da731c0b8c7c752a25eca4bacb842406224381070 SHA512 f0cdee53ce0438bed8601015909d4ad96c76408c85cfbc16b5dacaf4cc0424e52cb69830afe9edadd8fff29497ac2fa68979b36372d63863498ffd119008ab19 WHIRLPOOL 7318d897d0677f35af3c357bb9d30c808c0926661e47fa7dcd24b8d42063db1e372341f5065fa65a7dd874b5b8633e55e5ce47dee03a7bbab65b07777b5ae5e0
-EBUILD evolution-data-server-3.8.4.ebuild 3646 SHA256 f6d7f774fe4aa667f7ff83d43a28f744a4697c935126a00881753023fb9f2fe1 SHA512 1c6d532480d49897d20d19c780b5b0e9e22992c295bcd529de4bdee5f7bd8c34cb0b099e38317e895f76043a83d2dcf12d40b48f334dc4f043b9513bc8f1c5e7 WHIRLPOOL 2f6793fb071f0648ee77c9d1699447dabd191fdf8766f6a657353988e40f59f8f1e521e7cac96fea43aae59318987938d3505bec11573a6502d335787dec101f
-EBUILD evolution-data-server-3.8.5.ebuild 3648 SHA256 0a97e92b7fb77f30919ef14235187b16dc9a6d3db60db1343c3ba98ffc98c5e4 SHA512 b2e15b1ba921bf123394445b17a6a7f72f67e69c832accea8125bfed80f1e7344c0682c7765c44c6662f1e5ec8902e8d54f900941bdde7c92b3857e3343ad30c WHIRLPOOL 09707d30ccdb2e8c1decb9bd77bbb2d0e3a6aacd8b4e25af6ada066a80b6d80b399b9093e66bc3fc82060d347c51afaedbd86cf9a50f865c3643bb8d826714b7
-MISC ChangeLog 74141 SHA256 a1a596f695889d00cc4a4064974a7f5c78f2ff63330b76099c2f72d0d6ebc64f SHA512 819ee6d90dd49561634146b373b0aa3efa2449d14c0d04a859d824c531879e13d021bebddd0dd14c142f50bc72c8ee805c214ec7241ce0844719e059a2262779 WHIRLPOOL 2826fbc16ee11dad9d693f58915b394c2166ada5da043a0d0f422cc4b9a7a4f2b9d5fbea280afb691f4afbe5a3f280f47f71bcd9a59bcddf7035fba3b4901c9a
+EBUILD evolution-data-server-3.8.5.ebuild 3654 SHA256 0443fde94c0439c3ac1328d82386213b54ccc06433e039028878d5bd39cbc499 SHA512 bb7ead51e1aeab98fdcd43a381f02fec58b7c762d0bf1a0932bfce5e7a8c353cb5b9290a70cb074f3b3a0c4fa60b5a17efba7e14d3dc3a7078a441f9b2f371bb WHIRLPOOL d73c9ad9763b843a3ba7c83be8ee60edcdb1ef71f84648024f3d87126c09796230d317f35919d9ac5dd38780dc4e8ec9c160203ae0b3e2e72b97341302465e6f
+MISC ChangeLog 74465 SHA256 4d15c663bae0b219e26fa74ec94216b8c8d2dc8d4c6adc7c388460738d1fcfa6 SHA512 31ff9a41b3d246d159303e89f06e089a6b55cca8a21ec14e5ce4fceaeba77ffedf608e716aaeacbf205d22d4b7bf3572af6208c940ebcd8f4574bb8fac2fc263 WHIRLPOOL 6d39c8ca1a0bbf0d27f444f786aa6c88efed7958a978902dedc9b3c4853a6723437664fd9387cf45f4864ad672e3b3947a4a492e56ed8d5a5d035641b6d39e8b
 MISC metadata.xml 506 SHA256 3b17f5d3335559ed8198c33f0866c39d854a452218344082d4453dddf555710b SHA512 4916d65f5fc5ccf4ddb5bd12717e3d839e01240df064c0b485f106713aa28573dd9a79944d2f4db0371fd766f8ff2938580b91fc90d2a72e44b9829f4e026b89 WHIRLPOOL 6b863b456d3e3c87a88cfcdfaaa105b4620524d840af99cafb9a70ea6ae619113e3c5e9575f3f7d4e487a695aa26aa3246e79c36059fa555f158d5fc3923a86a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKN9/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOsYcP+gIgpOxuGa/nfeejdX55Njew
-LuLrfefPLDLSkn4canscx7ktuoGZGjT5NAAEoP0rBvYPjZNx5QeOFb3qW6W9KhR1
-OlB7mQpIEkQJpqMvVqVPRXLFGM0nAGiwNDeqMF1rV7BZhdGjuqIXKwxKVJ8kNUXG
-I5nmMHPcac3eH12A6X6jpy9u+OPmpqieg6BkKOcOI26EGrT71XXDxP5lIdU0wezp
-H690Swwm36r4/P414pFzLzZRq8Bn24MHT9M6PkPhXSY2FjOAUBDgDPsXh3tP+7LG
-chv0TrUS5cUCv/GJQ/d7fR0UGq7qqyVZg7Z+uu2g0mAk5GhN3BckGNtKEJA3AVAs
-lQl3WxL4sCj3uPieSEWs+B6xn4AJywIaQ+34bX+TyuLTEgKm7kTDOcEy5Mf1Mc4D
-kBQofo2ZR3TPcLO0rR1mHq+kJkDSNpQuFOPQQ0ZCBglRUNSP1iZl1rv0uTmCyOKn
-h4ITrW7of1xtrqODE/ENxdkPpKyIt85nNsvNtT0GVPqEcxO7Ng+kNNVn0ZtEfpXO
-sfLnkzv24sQ8XG07LI+0X/goJi1uqR/xWvOsB2gan/1r+PYIBgYybBF9v3dzzYyT
-YQODgsiVElw0vYUfK3bCwwu+AgKNbe5kckPVJV0WCfUYuBUxXH4za/tlEWNvDV9T
-e8ZiZOX7jYnJxULzaIfY
-=8g9l
+iEYEAREIAAYFAlKKclQACgkQCaWpQKGI+9TxcACfdTy2u3p/A88zbE5GznxH4yd6
+jd8AoIQWwzzWok1Ojp7pseW1ctTftcnx
+=QwNn
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.6.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.6.4.ebuild
deleted file mode 100644
index a1547f3e5253..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.6.4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2013 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.6.4.ebuild,v 1.2 2013/09/05 19:44:41 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit db-use eutils flag-o-matic gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/40" # subslot = libcamel-1.2 soname version
-IUSE="api-doc-extras +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.2:3
-	>=dev-db/sqlite-3.5:=
-	>=dev-libs/libgdata-0.10:=
-	>=gnome-base/gnome-keyring-2.20.1
-	>=dev-libs/libical-0.43:=
-	>=net-libs/libsoup-2.38.1:2.4
-	>=dev-libs/libxml2-2
-	>=sys-libs/db-4:=
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=app-crypt/gcr-3.4
-
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.2
-		>=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-3.5:2= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/fix-la-relink-command
-	dev-util/gperf
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-2
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-
-# FIXME
-RESTRICT="test"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	# /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_configure() {
-	# Uh, what to do about dbus-call-timeout ?
-	gnome2_src_configure \
-		$(use_enable api-doc-extras gtk-doc) \
-		$(use_with api-doc-extras private-docs) \
-		$(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_install() {
-	DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-	# 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.
-	fix-la-relink-command . || die "fix-la-relink-command failed"
-	gnome2_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym /usr/share/${PN}/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.8.4-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.8.4-r1.ebuild
deleted file mode 100644
index 71f3705df1e6..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.8.4-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2013 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.8.4-r1.ebuild,v 1.2 2013/09/05 19:44:41 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-# python3 not really supported, bug #478678
-PYTHON_COMPAT=( python2_7 pypy2_0 )
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit db-use eutils flag-o-matic gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://projects.gnome.org/evolution/arch.shtml"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/40" # subslot = libcamel-1.2 soname version
-IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-db/sqlite-3.5:=
-	>=dev-libs/libgdata-0.10:=
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/libical-0.43:=
-	>=net-libs/libsoup-2.40.3:2.4
-	>=dev-libs/libxml2-2
-	>=sys-libs/db-4:=
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=app-crypt/gcr-3.4
-
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	gtk? ( >=x11-libs/gtk+-3.2:3 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.90 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.5:2= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/fix-la-relink-command
-	dev-util/gperf
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-2
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Old POP3 mails can be removed before getting them, upstream bug #705446
-	epatch "${FILESDIR}/${P}-pop3-removal.patch"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	# /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_configure() {
-	# phonenumber does not exist in tree
-	gnome2_src_configure \
-		$(use_enable api-doc-extras gtk-doc) \
-		$(use_with api-doc-extras private-docs) \
-		$(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) \
-		$(use_enable gtk) \
-		--enable-google \
-		--enable-nntp \
-		--enable-largefile \
-		--enable-smime \
-		--with-libdb="${EPREFIX}"/usr \
-		--without-phonenumber \
-		--disable-uoa
-}
-
-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.
-	fix-la-relink-command . || die "fix-la-relink-command failed"
-	gnome2_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	unset DISPLAY
-	Xemake check
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.8.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.8.4.ebuild
deleted file mode 100644
index f54d409c761e..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.8.4.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2013 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.8.4.ebuild,v 1.5 2013/09/05 19:44:41 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-# python3 not really supported, bug #478678
-PYTHON_COMPAT=( python2_7 pypy2_0 )
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://projects.gnome.org/evolution/arch.shtml"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/40" # subslot = libcamel-1.2 soname version
-IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-db/sqlite-3.5:=
-	>=dev-libs/libgdata-0.10:=
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/libical-0.43:=
-	>=net-libs/libsoup-2.40.3:2.4
-	>=dev-libs/libxml2-2
-	>=sys-libs/db-4:=
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=app-crypt/gcr-3.4
-
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	gtk? ( >=x11-libs/gtk+-3.2:3 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.90 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.5:2= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/fix-la-relink-command
-	dev-util/gperf
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-2
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	# /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_configure() {
-	# phonenumber does not exist in tree
-	gnome2_src_configure \
-		$(use_enable api-doc-extras gtk-doc) \
-		$(use_with api-doc-extras private-docs) \
-		$(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) \
-		$(use_enable gtk) \
-		--enable-google \
-		--enable-nntp \
-		--enable-largefile \
-		--enable-smime \
-		--with-libdb="${EPREFIX}"/usr \
-		--without-phonenumber \
-		--disable-uoa
-}
-
-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.
-	fix-la-relink-command . || die "fix-la-relink-command failed"
-	gnome2_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	unset DISPLAY
-	Xemake check
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.8.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.8.5.ebuild
index 2e116fde754e..d72058583fb4 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.8.5.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-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/gnome-extra/evolution-data-server/evolution-data-server-3.8.5.ebuild,v 1.2 2013/09/05 19:44:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.8.5.ebuild,v 1.3 2013/11/18 20:02:26 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-libs/glib-2.34:2
 	>=dev-db/sqlite-3.5:=
 	>=dev-libs/libgdata-0.10:=
-	>=app-crypt/libsecret-0.5
+	>=app-crypt/libsecret-0.5[crypt]
 	>=dev-libs/libical-0.43:=
 	>=net-libs/libsoup-2.40.3:2.4
 	>=dev-libs/libxml2-2
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.8.4-pop3-removal.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.8.4-pop3-removal.patch
deleted file mode 100644
index 7103b16ab5fd..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-3.8.4-pop3-removal.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 809b48f1f1fa3a5f242d311be236a93bb012db53 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 08 Aug 2013 05:46:53 +0000
-Subject: Bug #705446 - Old POP3 mails can be removed before getting them
-
----
-diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
-index 2395c12..8390ef9 100644
---- a/camel/providers/pop3/camel-pop3-folder.c
-+++ b/camel/providers/pop3/camel-pop3-folder.c
-@@ -443,6 +443,47 @@ pop3_folder_get_uids (CamelFolder *folder)
- 	return uids;
- }
- 
-+static GPtrArray *
-+pop3_get_uncached_uids (CamelFolder *folder,
-+			GPtrArray *uids,
-+			GError **error)
-+{
-+	CamelPOP3Folder *pop3_folder;
-+	CamelPOP3Store *pop3_store;
-+	CamelDataCache *pop3_cache;
-+	GPtrArray *uncached_uids;
-+	gint ii;
-+
-+	g_return_val_if_fail (CAMEL_IS_POP3_FOLDER (folder), NULL);
-+	g_return_val_if_fail (uids != NULL, NULL);
-+
-+	pop3_folder = CAMEL_POP3_FOLDER (folder);
-+	pop3_store = CAMEL_POP3_STORE (camel_folder_get_parent_store (folder));
-+	pop3_cache = camel_pop3_store_ref_cache (pop3_store);
-+
-+	uncached_uids = g_ptr_array_new ();
-+
-+	for (ii = 0; ii < uids->len; ii++) {
-+		const gchar *uid = uids->pdata[ii];
-+		CamelStream *stream = NULL;
-+		CamelPOP3FolderInfo *fi;
-+		gchar buffer[1];
-+
-+		fi = g_hash_table_lookup (pop3_folder->uids_fi, uid);
-+		if (!fi || !pop3_cache ||
-+		    (stream = camel_data_cache_get (pop3_cache, "cache", fi->uid, NULL)) == NULL ||
-+		    camel_stream_read (stream, buffer, 1, NULL, NULL) != 1 ||
-+		    buffer[0] != '#')
-+			g_ptr_array_add (uncached_uids, (gpointer) camel_pstring_strdup (uid));
-+
-+		g_clear_object (&stream);
-+	}
-+
-+	g_clear_object (&pop3_cache);
-+
-+	return uncached_uids;
-+}
-+
- static gchar *
- pop3_folder_get_filename (CamelFolder *folder,
-                           const gchar *uid,
-@@ -920,7 +961,7 @@ pop3_folder_synchronize_sync (CamelFolder *folder,
- 
- 	g_object_unref (settings);
- 
--	if (is_online && delete_after_days > 0 && !expunge) {
-+	if (is_online && delete_after_days > 0 && !expunge && !g_cancellable_is_cancelled (cancellable)) {
- 		camel_operation_push_message (
- 			cancellable, _("Expunging old messages"));
- 
-@@ -930,6 +971,12 @@ pop3_folder_synchronize_sync (CamelFolder *folder,
- 		camel_operation_pop_message (cancellable);
- 	}
- 
-+	if (g_cancellable_is_cancelled (cancellable)) {
-+		if (error && !*error)
-+			g_cancellable_set_error_if_cancelled (cancellable, error);
-+		return FALSE;
-+	}
-+
- 	if (!expunge || (keep_on_server && !delete_expunged))
- 		return TRUE;
- 
-@@ -948,6 +995,15 @@ pop3_folder_synchronize_sync (CamelFolder *folder,
- 	pop3_engine = camel_pop3_store_ref_engine (pop3_store);
- 
- 	for (i = 0; i < pop3_folder->uids->len; i++) {
-+		if (g_cancellable_set_error_if_cancelled (cancellable, error)) {
-+			g_clear_object (&pop3_cache);
-+			g_clear_object (&pop3_engine);
-+
-+			camel_operation_pop_message (cancellable);
-+
-+			return FALSE;
-+		}
-+
- 		fi = pop3_folder->uids->pdata[i];
- 		/* busy already?  wait for that to finish first */
- 		if (fi->cmd) {
-@@ -971,6 +1027,15 @@ pop3_folder_synchronize_sync (CamelFolder *folder,
- 	}
- 
- 	for (i = 0; i < pop3_folder->uids->len; i++) {
-+		if (g_cancellable_set_error_if_cancelled (cancellable, error)) {
-+			g_clear_object (&pop3_cache);
-+			g_clear_object (&pop3_engine);
-+
-+			camel_operation_pop_message (cancellable);
-+
-+			return FALSE;
-+		}
-+
- 		fi = pop3_folder->uids->pdata[i];
- 		/* wait for delete commands to finish */
- 		if (fi->cmd) {
-@@ -1005,6 +1070,7 @@ camel_pop3_folder_class_init (CamelPOP3FolderClass *class)
- 	folder_class->get_message_count = pop3_folder_get_message_count;
- 	folder_class->get_uids = pop3_folder_get_uids;
- 	folder_class->free_uids = camel_folder_free_shallow;
-+	folder_class->get_uncached_uids = pop3_get_uncached_uids;
- 	folder_class->get_filename = pop3_folder_get_filename;
- 	folder_class->set_message_flags = pop3_folder_set_message_flags;
- 	folder_class->get_message_sync = pop3_folder_get_message_sync;
-@@ -1151,6 +1217,9 @@ camel_pop3_delete_old (CamelFolder *folder,
- 		return FALSE;
- 	}
- 
-+	if (g_cancellable_set_error_if_cancelled (cancellable, error))
-+		return FALSE;
-+
- 	pop3_folder = CAMEL_POP3_FOLDER (folder);
- 	pop3_store = CAMEL_POP3_STORE (parent_store);
- 	pop3_cache = camel_pop3_store_ref_cache (pop3_store);
-@@ -1163,6 +1232,13 @@ camel_pop3_delete_old (CamelFolder *folder,
- 		message_time = 0;
- 		fi = pop3_folder->uids->pdata[i];
- 
-+		if (g_cancellable_set_error_if_cancelled (cancellable, error)) {
-+			g_clear_object (&pop3_cache);
-+			g_clear_object (&pop3_engine);
-+
-+			return FALSE;
-+		}
-+
- 		if (fi->cmd) {
- 			while (camel_pop3_engine_iterate (pop3_engine, fi->cmd, cancellable, NULL) > 0) {
- 				; /* do nothing - iterating until end */
-@@ -1199,6 +1275,13 @@ camel_pop3_delete_old (CamelFolder *folder,
- 				__FILE__, __LINE__, day_lag, days_to_delete));
- 
- 			if (day_lag > days_to_delete) {
-+				if (g_cancellable_set_error_if_cancelled (cancellable, error)) {
-+					g_clear_object (&pop3_cache);
-+					g_clear_object (&pop3_engine);
-+
-+					return FALSE;
-+				}
-+
- 				if (fi->cmd) {
- 					while (camel_pop3_engine_iterate (pop3_engine, fi->cmd, cancellable, NULL) > 0) {
- 						; /* do nothing - iterating until end */
-@@ -1224,6 +1307,13 @@ camel_pop3_delete_old (CamelFolder *folder,
- 	}
- 
- 	for (i = 0; i < pop3_folder->uids->len; i++) {
-+		if (g_cancellable_set_error_if_cancelled (cancellable, error)) {
-+			g_clear_object (&pop3_cache);
-+			g_clear_object (&pop3_engine);
-+
-+			return FALSE;
-+		}
-+
- 		fi = pop3_folder->uids->pdata[i];
- 		/* wait for delete commands to finish */
- 		if (fi->cmd) {
---
-cgit v0.9.2