Purging old ebuilds/patches. Dropped 'static' USE flag. Removed USE_DESTDIR.

Package-Manager: portage-2.1_pre7-r2

12 files changed, 20 insertions, 337 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index f4da663cda58..9521d8780385 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.77 2006/03/18 23:08:42 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.78 2006/03/30 23:47:41 leonardop Exp $
+
+  30 Mar 2006; Leonardo Boshell <leonardop@gentoo.org>
+  -files/evolution-data-server-1.0.2-amd64_mutex.patch,
+  -evolution-data-server-1.0.2.ebuild, -evolution-data-server-1.0.3.ebuild,
+  -evolution-data-server-1.0.4.ebuild,
+  -evolution-data-server-1.4.1.1.ebuild, evolution-data-server-1.6.0.ebuild:
+  Purging old ebuilds. Dropped 'static' USE flag. Removed USE_DESTDIR.
 
 *evolution-data-server-1.6.0 (18 Mar 2006)
 
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 98d73a9a28a6..c6f4d272f241 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,51 +1,24 @@
-MD5 f75651987946149f09078617852d63e1 ChangeLog 11157
-RMD160 a43d07df3a2514a67ad2076d12ce6ee7c4a1db64 ChangeLog 11157
-SHA256 ad1ee6dca79aa635d49e26c09930ef635ac529e0d66032db656d0e1b537efd6d ChangeLog 11157
-MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065
-RMD160 776975e43221f79bc5fae1eab410cdfdf221c614 evolution-data-server-1.0.2.ebuild 1065
-SHA256 8200e08ce346d09112df41adef007a273a663bd69a144bb53212d77c078733c3 evolution-data-server-1.0.2.ebuild 1065
-MD5 368efaf736537929d3c127b9608a1ae2 evolution-data-server-1.0.3.ebuild 983
-RMD160 eeb3681a1537fb414298d85b7e7e812224c577ce evolution-data-server-1.0.3.ebuild 983
-SHA256 cf717ed7390d83a246b57e8bc765bb3e6c6252739a6eb6e791e872ececbbc278 evolution-data-server-1.0.3.ebuild 983
-MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985
-RMD160 033ba327ec824f6ce8765c7ce4c209914311dbdf evolution-data-server-1.0.4.ebuild 985
-SHA256 5bf8125df9424d04c5152640795bd59ac7e7e9c941d376682ca00e6026ba941c evolution-data-server-1.0.4.ebuild 985
+MD5 16ee40b5dc65dfc3df3e907315974f43 ChangeLog 11532
+RMD160 16166e9393a9cd1dd7620a50df4d427e845b39ee ChangeLog 11532
+SHA256 1bf650b82fa48506204add26eaefb20aa0db330dfacf5d49d093ed226b631e7d ChangeLog 11532
 MD5 b9bba807060f2d2996ab9ef339a7e360 evolution-data-server-1.2.3.ebuild 2537
 RMD160 60fd8314391da1da39eb23eba5fe2ac42099e192 evolution-data-server-1.2.3.ebuild 2537
 SHA256 cd9ba39f93c59c7d0f1834b4224a4a92a27f88c1f94ccfbeb1de66c3cff4cdab evolution-data-server-1.2.3.ebuild 2537
-MD5 36265d101a2a38d3dd1d8c529614017b evolution-data-server-1.4.1.1.ebuild 3599
-RMD160 f369ce363b83dff56b78c79b73484c0004a90fb9 evolution-data-server-1.4.1.1.ebuild 3599
-SHA256 06d2dbf653acae537bf9f1edffd87b7c763f5c3d3a91c302d97e9ad2caf94e50 evolution-data-server-1.4.1.1.ebuild 3599
 MD5 974d62b757de069dbb51b899a0abc346 evolution-data-server-1.4.2.1.ebuild 2804
 RMD160 25fb5e53a54c80d02d96f05bf0289ec9ceb82842 evolution-data-server-1.4.2.1.ebuild 2804
 SHA256 566f138d7c5cde6dcbe4fb82a4193c7fe49a259d77a5810e145d5844f6cf8b63 evolution-data-server-1.4.2.1.ebuild 2804
-MD5 5a9fd49004940c92a50e2f0fdc0ba10d evolution-data-server-1.6.0.ebuild 2853
-RMD160 3d091642110d326fe1c907f5b1d2482d1bbaee7f evolution-data-server-1.6.0.ebuild 2853
-SHA256 c3c950dd8121198d374c4e54077bb0543d896b9a6a3c3a5dfa46bd59449fff28 evolution-data-server-1.6.0.ebuild 2853
-MD5 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81
-RMD160 287023a31ffd83573f75d2a08e77a93b86d50cbb files/digest-evolution-data-server-1.0.2 81
-SHA256 86965f11b732c3b75605e262c299ef2dfeabf38faff07b16073336ea1dba8209 files/digest-evolution-data-server-1.0.2 81
-MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81
-RMD160 fd02263c1a8bf1e68c14fe8f74a90c09bb38d642 files/digest-evolution-data-server-1.0.3 81
-SHA256 ea7944a1c934bc649637895ba003de49fbe05722ae4a9311a34f7e1664aaec60 files/digest-evolution-data-server-1.0.3 81
-MD5 677d10afd2898cc22305dd302a01d2e7 files/digest-evolution-data-server-1.0.4 81
-RMD160 22c38320434c1f82c32189c65a0857ef835e87ed files/digest-evolution-data-server-1.0.4 81
-SHA256 b710ae53b346611eb14e096b78398fac24e6a142100cd2b1ffacb6c49bbd1ddb files/digest-evolution-data-server-1.0.4 81
+MD5 3c12ce88c69c00d4be5a994c8e3293c0 evolution-data-server-1.6.0.ebuild 2728
+RMD160 4d60ff2ec8ce1ca909e5b356f48d0f402eac4875 evolution-data-server-1.6.0.ebuild 2728
+SHA256 ac418c3c8053fed59bfe5f65db9adc929617061b8b9665e09e776e016809570f evolution-data-server-1.6.0.ebuild 2728
 MD5 035a24e01dccf6365e41d4544b019f03 files/digest-evolution-data-server-1.2.3 82
 RMD160 04f47cd1b4e6f85d29f3279990e471a12ca7b33c files/digest-evolution-data-server-1.2.3 82
 SHA256 efe1ef5ce68c11955be4e472e1e2cf7e67c690c42e2b06e18ac9be27d90de706 files/digest-evolution-data-server-1.2.3 82
-MD5 669f789ef1cc9df48729b5edecef2d52 files/digest-evolution-data-server-1.4.1.1 84
-RMD160 ba8a4aa989cc1284d98e8b43ce98cfac44debfd9 files/digest-evolution-data-server-1.4.1.1 84
-SHA256 b4e87315f05b9b04de5225dfc32727c1f2315d47c900cda799d05a49356c66ff files/digest-evolution-data-server-1.4.1.1 84
 MD5 4355466348971909faf3899483361ad5 files/digest-evolution-data-server-1.4.2.1 84
 RMD160 56aafded44ee1d1bc3a691e1ddf23563edbf4893 files/digest-evolution-data-server-1.4.2.1 84
 SHA256 4bba061ab0f96b8a9954a5f66e56a43010f1a0f14274fad88bf3b418d486fceb files/digest-evolution-data-server-1.4.2.1 84
 MD5 c667a141e2cc5880fbbfcaef5536f8e8 files/digest-evolution-data-server-1.6.0 289
 RMD160 b29093f3eb89071dd8ef7d9b455edc6c4d7af216 files/digest-evolution-data-server-1.6.0 289
 SHA256 7c777528d012489f4062c350c5c9bb60384949b25cb04ce77b67e480bb0a824d files/digest-evolution-data-server-1.6.0 289
-MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
-RMD160 49bde97881ad2b07c7478482ea4b03c450272883 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
-SHA256 f3e40f1012de6e69664ca342db14bff97fc4f51a98a435b89724d50b12a0415f files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
 MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
 RMD160 d48ad5a34bfdf9f814b9ae22ba188f2f0c7f0304 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
 SHA256 a64e0e4d74ac91f69c4b7a011b6325e27af6fa28a58e20f48ff09ec2a1538c5a files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.0.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.0.2.ebuild
deleted file mode 100644
index d8bdc123490f..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.0.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 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-1.0.2.ebuild,v 1.17 2005/02/04 06:16:38 geoman Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.ximian.com/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="x86 alpha amd64 arm hppa ia64 mips ppc sparc ppc64"
-IUSE="doc ldap"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/libbonobo-2.4
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/gconf-2
-	>=dev-libs/libxml2-2
-	>=net-libs/libsoup-2.2.1
-	ldap? ( >=net-nds/openldap-2.0 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.30
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-G2CONF="${G2CONF} `use_with ldap openldap`"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-USE_DESTDIR=1
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-amd64_mutex.patch
-}
-
-src_compile() {
-	cd ${S}/libdb/dist
-	./s_config || die
-
-	cd ${S}
-	gnome2_src_compile
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.0.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.0.3.ebuild
deleted file mode 100644
index 98393c400a16..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.0.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 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-1.0.3.ebuild,v 1.9 2005/04/07 15:22:43 blubb Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.ximian.com/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="x86 alpha amd64 arm hppa ia64 mips ppc sparc ~ppc64"
-IUSE="doc ldap"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/libbonobo-2.4.2
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/gconf-2
-	>=dev-libs/libxml2-2
-	>=net-libs/libsoup-2.2.1
-	ldap? ( >=net-nds/openldap-2.0 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.30
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-G2CONF="${G2CONF} `use_with ldap openldap`"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-USE_DESTDIR=1
-
-src_compile() {
-	cd ${S}/libdb/dist
-	./s_config || die
-
-	cd ${S}
-	gnome2_src_compile
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.0.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.0.4.ebuild
deleted file mode 100644
index e83b28180152..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.0.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 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-1.0.4.ebuild,v 1.8 2005/05/25 04:04:34 vapier Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.ximian.com/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86"
-IUSE="doc ldap"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/libbonobo-2.4.2
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/gconf-2
-	>=dev-libs/libxml2-2
-	>=net-libs/libsoup-2.2.2
-	ldap? ( >=net-nds/openldap-2.0 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.30
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-G2CONF="${G2CONF} `use_with ldap openldap`"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-USE_DESTDIR=1
-
-src_compile() {
-	cd ${S}/libdb/dist
-	./s_config || die
-
-	cd ${S}
-	gnome2_src_compile
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.4.1.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.4.1.1.ebuild
deleted file mode 100644
index 9edac6b48e09..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.4.1.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2005 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-1.4.1.1.ebuild,v 1.1 2005/11/05 05:14:14 dang Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.ximian.com/"
-
-LICENSE="LGPL-2 Sleepycat"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc ipv6 kerberos krb4 ldap mozilla nntp ssl static"
-
-RDEPEND=">=dev-libs/glib-2.4
-	>=gnome-base/libbonobo-2.4.2
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libgnome-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=net-libs/libsoup-2.2.2
-	sys-libs/zlib
-	ldap? ( >=net-nds/openldap-2.0 )
-	ssl? (
-		mozilla? ( >=www-client/mozilla-1.7.3 )
-		!mozilla? (
-			>=dev-libs/nspr-4.4
-			>=dev-libs/nss-3.9 ) )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )"
-#		mozilla? ( !firefox? ( >=www-client/mozilla-1.7.3 ) )
-#		firefox? ( >=www-client/mozilla-firefox-1.0.6-r6 )
-#		!mozilla? ( !firefox? (
-#		)
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.28
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-USE_DESTDIR="1"
-DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-
-pkg_setup() {
-	G2CONF="$(use_with ldap openldap) \
-		$(use_with kerberos krb5 /usr) \
-		$(use_enable ssl nss)          \
-		$(use_enable ssl smime)        \
-		$(use_enable ipv6)             \
-		$(use_enable nntp)             \
-		$(use_enable static)"
-
-	use ldap && G2CONF="${G2CONF} $(use_with static static-ldap)"
-
-	if use krb4 && ! built_with_use virtual/krb5 krb4; then
-		ewarn
-		ewarn "In order to add kerberos 4 support, you have to emerge"
-		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
-		ewarn
-		ewarn "Skipping for now."
-		ewarn
-		G2CONF="${G2CONF} --without-krb4"
-	else
-		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
-	fi
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
-	# upstream gcc4 fix
-	epatch ${FILESDIR}/${PN}-1.2.3-gcc4.patch
-
-	# Resolve symbols at execution time for setgid binaries
-	epatch ${FILESDIR}/${PN}-no_lazy_bindings.patch
-
-	export WANT_AUTOMAKE=1.7
-	automake || die "automake failed"
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled. They can be used from
-	# mozilla/firefox if the relevant USE flags are enabled. 'firefox' take
-	# precedence over 'mozilla'.
-	if use ssl ; then
-#		if use firefox; then
-#			NSS_LIB=$(pkg-config --variable=libdir firefox-nss)
-#			NSS_INC=$(pkg-config --variable=includedir firefox-nss)/nss
-#			NSPR_LIB=$(pkg-config --variable=libdir firefox-nspr)
-#			NSPR_INC=$(pkg-config --variable=includedir firefox-nspr)/nspr
-#		elif use mozilla; then
-		if use mozilla; then
-			NSS_LIB=$(pkg-config --variable=libdir mozilla-nss)
-			NSS_INC=$(pkg-config --variable=includedir mozilla-nss)/nss
-			NSPR_LIB=$(pkg-config --variable=libdir mozilla-nspr)
-			NSPR_INC=$(pkg-config --variable=includedir mozilla-nspr)/nspr
-		else
-			NSS_LIB=/usr/$(get_libdir)/nss
-			NSS_INC=/usr/include/nss
-			NSPR_LIB=/usr/$(get_libdir)/nspr
-			NSPR_INC=/usr/include/nspr
-		fi
-
-		G2CONF="${G2CONF} \
-			--with-nspr-includes=${NSPR_INC} \
-			--with-nspr-libs=${NSPR_LIB}     \
-			--with-nss-includes=${NSS_INC}   \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	cd "${S}/libdb/dist"
-	./s_config || die
-
-	cd "${S}"
-	gnome2_src_compile
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.6.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.6.0.ebuild
index 1fb8bcc70fc7..d8ffa7f0757d 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.6.0.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-1.6.0.ebuild,v 1.1 2006/03/18 23:08:42 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.6.0.ebuild,v 1.2 2006/03/30 23:47:41 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.ximian.com/"
 LICENSE="LGPL-2 Sleepycat"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc ipv6 kerberos krb4 ldap nntp ssl static"
+IUSE="doc ipv6 kerberos krb4 ldap nntp ssl"
 
 RDEPEND=">=dev-libs/glib-2.4
 	>=gnome-base/libbonobo-2.4.2
@@ -25,8 +25,9 @@ RDEPEND=">=dev-libs/glib-2.4
 	>=net-libs/libsoup-2.2
 	sys-libs/zlib
 	ldap? ( >=net-nds/openldap-2.0 )
-	ssl? ( >=dev-libs/nspr-4.4
-		   >=dev-libs/nss-3.9 )
+	ssl? (
+		>=dev-libs/nspr-4.4
+		>=dev-libs/nss-3.9 )
 	kerberos? ( virtual/krb5 )
 	krb4? ( virtual/krb5 )"
 
@@ -36,7 +37,6 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1.4 )"
 
 MAKEOPTS="${MAKEOPTS} -j1"
-USE_DESTDIR="1"
 DOCS="ChangeLog MAINTAINERS NEWS TODO"
 
 
@@ -46,10 +46,7 @@ pkg_setup() {
 		$(use_enable ssl nss)          \
 		$(use_enable ssl smime)        \
 		$(use_enable ipv6)             \
-		$(use_enable nntp)             \
-		$(use_enable static)"
-
-	use ldap && G2CONF="${G2CONF} $(use_with static static-ldap)"
+		$(use_enable nntp)"
 
 	if use krb4 && ! built_with_use virtual/krb5 krb4; then
 		ewarn
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.2 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.2
deleted file mode 100644
index 331bbcf8e9ee..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca13b5dd751cd30c55e889d9a07e70fb evolution-data-server-1.0.2.tar.bz2 4939846
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.3 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.3
deleted file mode 100644
index 4ad6d94e21ee..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6fc9aa8178540828c0056e2b070b7546 evolution-data-server-1.0.3.tar.bz2 4869529
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.4 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.4
deleted file mode 100644
index 212a09ff8788..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c9c6cac9b65d392e50ea3214022cb5b evolution-data-server-1.0.4.tar.bz2 4792220
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.4.1.1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.4.1.1
deleted file mode 100644
index fb86adbdcb21..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.4.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1590ec25527b1bcc5046e84ec2d1227f evolution-data-server-1.4.1.1.tar.bz2 14175749
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.0.2-amd64_mutex.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.0.2-amd64_mutex.patch
deleted file mode 100644
index de8244373854..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.0.2-amd64_mutex.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- evolution-data-server-1.0.2/libdb/dbinc/mutex.h.old	2004-10-17 17:56:45.286185136 +0100
-+++ evolution-data-server-1.0.2/libdb/dbinc/mutex.h	2004-10-17 17:57:11.438209424 +0100
-@@ -754,31 +754,6 @@
- #endif
- 
- /*********************************************************************
-- * x86_64/gcc assembly.
-- *********************************************************************/
--#ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
--typedef unsigned char tsl_t;
--
--#ifdef LOAD_ACTUAL_MUTEX_CODE
--/*
-- * For gcc/x86-64, 0 is clear, 1 is set.
-- */
--#define	MUTEX_SET(tsl) ({						\
--	register tsl_t *__l = (tsl);					\
--	int __r;							\
--	asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
--	    : "=&a" (__r), "=m" (*__l)					\
--	    : "1" (*__l)						\
--	    );								\
--	__r & 1;							\
--})
--
--#define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
--#define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
--#endif
--#endif
--
--/*********************************************************************
-  * alphalinux/gcc assembly.
-  *********************************************************************/
- #ifdef HAVE_MUTEX_ALPHA_LINUX_ASSEMBLY