Clean up old revisions.

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

5 files changed, 10 insertions, 458 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 314c8c7275f9..c0e81616f6e4 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,11 @@
 # 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.364 2013/03/29 16:57:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.365 2013/03/29 20:11:31 eva Exp $
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -evolution-data-server-2.32.3-r2.ebuild, -evolution-data-server-3.4.4.ebuild,
+  -evolution-data-server-3.6.2-r1.ebuild:
+  Clean up old revisions.
 
   29 Mar 2013; Pacho Ramos <pacho@gentoo.org>
   evolution-data-server-3.8.0.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 08ceae88fd9b..3372e3788c22 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -12,23 +12,17 @@ AUX evolution-data-server-2.32.3-libxml2-2.9.patch 4438 SHA256 db65f8053098409e1
 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.4.4.tar.xz 3647048 SHA256 ce9e1d5625503cd7f1f0631ec2f552e26800c33305b45722b34eba8da5ced491 SHA512 0c8945c01f634f0736935cd1096edd294a988707a8a229c2a38cfed8931952e670050a040c50da23a3be605f0a121cfb0d2cf0d8da8ec7d45edf0473b9af251f WHIRLPOOL afc940b4c0065d424048e0d87a6b1cd4fe9728c1480ec479df159e3940cc82daed51100bc4ce99de8df3d490bc50e9100898b0a1871e0e389e95b61fd37f233e
-DIST evolution-data-server-3.6.2-gentoo-patches.tar.xz 12836 SHA256 38ac40ca3fb16593f61c0eb6c30204bf841ac3df727ea8e729da79f392b29495 SHA512 d250381c421f29463a7f2c5f28c6deef0eca9fd60c34137ac6fbba7e862cac980fb03ed2343c30151dcf61194105b927c8ef25c7720fe18a9637474b0aeaebfb WHIRLPOOL 7672783c9d6798b6541baa0b3ae14ffbbd12be5234fcdabcf0846280fcf7e272311990dd9a73ca35ced03f55347cc97e8eef8bb701adb0cabf1f0601fc6ca451
-DIST evolution-data-server-3.6.2.tar.xz 3953424 SHA256 bc94d8b9f1a6fb81a630cf38abec303b87a87ce2fd880f9519c23e5de2ce88f0 SHA512 9cce9ec36327e24e011f2c4f627c7a9df86cf2b3ddfee5fd2e9c4b45224d81e18ff4991afcdfe6e609232b189b7464c5135f3e94bbade25cabaf1127e7f15a87 WHIRLPOOL a1ccd75c4f23b589ea38c1e90776d3485571899733250a03c78ca7cf5ca66da25f56af95f5c7cd3372631e32e56ca4c875fd8be09567e1c9e0f86c5c6d7e68b3
 DIST evolution-data-server-3.6.3.tar.xz 4073908 SHA256 37a0d0d4f6c8515e70e34f1e7e1f457f4c7736f35ba0f18c4b4bca0a17db7de0 SHA512 c22fc555857c60bdac671cdd53bfec4f7d63398c2f690ef540ca1dda5c3d06d49fde5a9310a1d12c1ad93de48dc507ead1342c3e0d9958b81d65b8f8714ce25b WHIRLPOOL 54dd5a904bb4e94baeeff68fb29ac0329ec80e3d845fe4b7f5795c9cabb67d061e194abced022cfee5f150fb06b36814fff744d9720d75e5cb938184e877147e
 DIST evolution-data-server-3.8.0.tar.xz 3898836 SHA256 fff7dca02abc52caa62ddbd93a9135c15da3f21c36c25774f3399fb7a6c1d41e SHA512 eaace87b55c1f46771008b11b171307eb549907f6769ba7d16879b0dd63c7af447f17d29e66d2c19ae73949029876b19681964bce57c9f8c4f1f0f9ea723e2b6 WHIRLPOOL 8c0fe136bb3b390a864d97dc827f5e4cecc4a48c5eb12c4a63f192bdf6da2dc8d5bb27da01e8656da0570dab4ba0e7ce331979d1177aa0c9b0f5bdfabc1b8106
-EBUILD evolution-data-server-2.32.3-r2.ebuild 4951 SHA256 3ebf16a907aad5c9ce1cbe68f43050165e25230f1fedf2976e2a1cda4e991dbe SHA512 0f191c89d2ea6e463cfa3a12ca5b922b2d842d0ec5651ad933cd7e08d42de23358e46a8374390897265296efd028bedac2bd9cd619673d33c7c38eca04d4d01c WHIRLPOOL 89fb49855e1663268927bda04eaed7e79977a426ea89302c218b145ec5f30f314ca470d980159aa26b231d0f31c06295b9dd058964d459bb36b3a447088b69df
 EBUILD evolution-data-server-2.32.3-r3.ebuild 5155 SHA256 131f1419171c2d7a877f7290948965dba3d3316cf24401bd48962e1e8993d661 SHA512 4340c7b1bac68b292d8a5a9c1fa51a316554d8307bdc7f2ce5cf28dfdf2c8ff58a9cecf350190359f20c39bf419931669ff8bbb540e7549f1b9c19798a10b27e WHIRLPOOL a12d27c6cc552b31c7407b1c583fd707cc01bd02ded30e5791ab26d82b6b4d8a6958846e3a2b34f91707b06f80c602e6efbb61d81d4b9a48c95758c92616cddd
-EBUILD evolution-data-server-3.4.4.ebuild 4012 SHA256 75dcfdca52053e7c936d13d563cc493fd73401767206ffb43ac9f6f2f8325a92 SHA512 52f0f9e3fbeb02da98c7e7ed03ac0c8f49e15e933a78022bd716c7ee6b93ac62ed4e5e7f8b22c758c1dd00d032389e3fb5fe9434ef8bf456f7d9979434aa6379 WHIRLPOOL 30d08e070075b5ef35b3d41eeeada12b05fb2a20c67bdb87e7abc7935cf352fc496deb5e411a0652cebd9211439c1f80cb7a176f5845d178fa90728db969879a
-EBUILD evolution-data-server-3.6.2-r1.ebuild 4119 SHA256 510d47e8a37aa4ec1262b2960aaa310c962f008280bcb7d65c584fb7ac23b7e8 SHA512 b477c2db4c9a2fafdf5051be3aeaf17b8bd2e7955a4cb0254d8ac027901a8deaeada474cffd72dd119f401916261e63775ce5690be175116abfbf158b1fba603 WHIRLPOOL 173392b6e46de0deda00f6345ce79c862c8df566ba058c2092d7ec0386e600dd3c8e917bdcff30d11b1bf94cba3638ddb988abe2a46d66cd93a84576a10476e7
 EBUILD evolution-data-server-3.6.3.ebuild 4001 SHA256 fedad84fb1c53a7ec5c2434e6e13fdb567ea46f8d1d36977de08d5d8a1d4c307 SHA512 890224e64768c554c7313407fe0c942e9ce610afdb6d22ab7609fe87e295c1b74bba96ccf66ed8ec6dd570f05e0ddfcfbb42aff4fe5e0d195506d656d4ecaf89 WHIRLPOOL 63864ebd9d47aa702729e91e74d7ac3260c8ec5b517d42b21aa59bf50b1e9e40f8cd619c2de2b8eeedf631cd3b568b7814d840b9b67cfa41f9755042a4dfa60d
 EBUILD evolution-data-server-3.8.0.ebuild 3622 SHA256 a378a05522c4eb2fccb4929c23373da4978072d1a6750287453284d225b2c0d0 SHA512 89a2487e345aa83ab7683c3e299ad282d23d0c91bcea2c173c617ae5e5a3cbc0d8fe7ee0cf052582bced80514e2e67fd2427948b8eed1ff40d26da88e60962aa WHIRLPOOL d107cb3276efd16cc1aff8c4409d9e9f3a2fbf0cf80add4023acb2704920cce9bab4de858ebd38b2fbe3c073f03ed2266ec75b0192acb3c249cf87b67fba74ae
-MISC ChangeLog 71560 SHA256 ab47697ed9f7e90d63cdb35104586fe9df7250a050bc0c35e03cdaefa6fadbf0 SHA512 ba37a1cd8700346ae5cbb3ca05bdb1db962284c6543ffcf4e2c35e9eed5c8a2e3584cf08fda2b3f9069629a7cf5de0a85c725f1cb2a49a4791dcf5cc81f3966b WHIRLPOOL b3b6e08f9663b072217b36bece34f82c0d4c1cdc53eb94fbf05978bad1f5a6ba18f36a77affe82657793ab0e7c1e74ea01e322dc4bc7d51b89b92bb73013ac0c
+MISC ChangeLog 71761 SHA256 a4a9bcd6dc2902adb216abe8d86ee600e3e27437a0d9c73eee061f3110bd61fa SHA512 8a9208da7e3bd253559f2e5db25898d4713950eca7493e85fbce5914f414630745722efdcadb174157970190ffb814d8e6f2f713d8c5aa8d30de194a4ce48c16 WHIRLPOOL a78a4605cb0a5357af03d20be25804f91d790dd0c2fe2dad799f099729ec8dc222e2cc7f7a3668b286b595c28157d53799ab934204810e146804866597016890
 MISC metadata.xml 566 SHA256 749e8fce0fc2cdea61722be44b2e4068020132e6982d4ffae92d01feb904f508 SHA512 854b04aaaed52ca0cb373f6ae4beb1222486200a21353c2b37c7e1ad49fb773c3d3fc867445e2ee301d7d110c99e84bb1fad9cdb5e24cd72bd7d13747a1f6f5c WHIRLPOOL 67ff1604f2ad20e8c18ea558ae6608ad7c88390168bc34a8b37125748de8b569ccd2d69e3e5feb5b7f01745f4709bfc4491763574ad322d3e17978e9f3763a2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFVyBEACgkQCaWpQKGI+9TBnQCdGYHyZGUCLFLVZjIdxKt/H4Hz
-GhsAn2z0eyM8YtEs4jnkkWSW7EJsRwvE
-=+tmo
+iEYEAREIAAYFAlFV9XQACgkQ1fmVwcYIWAbVEgCfQKbck7X66NlLykhZ7sZerNRQ
+n08AoJTRKlHlw/RnR1qI/eUXZ1wRH6gl
+=1g7k
 -----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
deleted file mode 100644
index feca4be6d2bd..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
+++ /dev/null
@@ -1,168 +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-2.32.3-r2.ebuild,v 1.13 2012/11/25 19:33:56 ulm 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
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-IUSE="ipv6 kerberos gnome-keyring ldap +weather"
-
-RDEPEND=">=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-2.24:2
-	>=gnome-base/gconf-2
-	>=dev-db/sqlite-3.5
-	>=dev-libs/libgdata-0.6.3
-	>=dev-libs/libical-0.43
-	>=net-libs/libsoup-2.4:2.4
-	>=dev-libs/libxml2-2
-	>=sys-libs/db-4
-	sys-libs/zlib
-	virtual/libiconv
-	>=dev-libs/nspr-4.4
-	>=dev-libs/nss-3.9
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2 )
-	weather? (
-		>=dev-libs/libgweather-2.25.4:2
-		<dev-libs/libgweather-2.91:2 )
-"
-DEPEND="${RDEPEND}
-	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"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-
-pkg_setup() {
-	DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-	# ssl stuff always enabled as recommended in upstream bug #642984
-	G2CONF="${G2CONF}
-		$(use_enable gnome-keyring)
-		$(use_enable ipv6)
-		$(use_with kerberos krb5 /usr)
-		$(use_with ldap openldap)
-		$(use_with weather)
-		--disable-gtk3
-		--enable-largefile
-		--with-libdb=/usr
-		--enable-ssl
-		--enable-smime"
-
-}
-
-src_prepare() {
-	# Adjust to gentoo's /etc/service
-	epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
-
-	# GNOME bug 611353 (skips failing test atm)
-	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"
-
-	# Apply multiple backports and fixed from master and 2.32 branches
-	#
-	# 009 and 010 patches are broken, bug #372651
-	rm "${WORKDIR}/${P}-patches"/009*.patch || die
-	rm "${WORKDIR}/${P}-patches"/010*.patch || die
-	epatch "${WORKDIR}/${P}-patches"/*.patch
-
-	# Upstream bug #655167 - Messages moved from IMAP Inbox reappear
-	epatch "${FILESDIR}/${P}-imap-move.patch"
-
-	# Fix building with glib-2.32, bug #412109
-	epatch "${FILESDIR}/${P}-gmodule-explicit.patch"
-	epatch "${FILESDIR}/${P}-g_thread_init.patch"
-
-	# /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
-	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure.ac configure || die "sed 3 failed"
-
-	sed -e "/AM_INIT_AUTOMAKE/s/-Werror//" -i configure.ac || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-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_preinst() {
-	gnome2_pkg_preinst
-
-	for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
-		libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
-		libedata-book-1.2.so.2 libebook-1.2.so.9 \
-		libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
-	do
-		preserve_old_lib /usr/$(get_libdir)/$lib
-	done
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
-		libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
-		libedata-book-1.2.so.2 libebook-1.2.so.9 \
-		libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
-	do
-		preserve_old_lib_notify /usr/$(get_libdir)/$lib
-	done
-
-	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.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.4.4.ebuild
deleted file mode 100644
index 4dc6b14466f3..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.4.4.ebuild
+++ /dev/null
@@ -1,139 +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.4.ebuild,v 1.6 2012/11/25 19:33:56 ulm Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit db-use eutils flag-o-matic gnome2 vala versionator 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"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="+gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
-
-RDEPEND=">=dev-libs/glib-2.31: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-util/fix-la-relink-command
-	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
-	vala? ( $(vala_depend) )"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-
-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
-		$(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
-	use vala && vala_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.
-	fix-la-relink-command . || die "fix-la-relink-command 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.6.2-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.6.2-r1.ebuild
deleted file mode 100644
index c265304f809b..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,140 +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.2-r1.ebuild,v 1.5 2013/02/02 22:36:37 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-# No PYTHON_DEPEND, python is only needed at build time
-
-inherit db-use eutils flag-o-matic gnome2 python vala versionator virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-gentoo-patches.tar.xz"
-
-# 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}
-	=dev-lang/python-2*
-	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"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	DOCS="ChangeLog MAINTAINERS NEWS TODO"
-	# Uh, what to do about dbus-call-timeout ?
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		$(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"
-
-	# Lots of crash and leak fixes, will be in 3.6.3
-	epatch ../patches/*.patch
-
-	gnome2_src_prepare
-	use vala && vala_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_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
-		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
-}