Remove old

(Portage version: 2.1.2.9)

9 files changed, 7 insertions, 613 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 741620e1dabf..b1e210f408ce 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.123 2007/06/02 02:49:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.124 2007/06/02 03:27:37 leio Exp $
+
+  02 Jun 2007; <leio@gentoo.org> -evolution-data-server-1.8.2.ebuild,
+  -evolution-data-server-1.8.3.ebuild,
+  -evolution-data-server-1.8.3-r1.ebuild,
+  -evolution-data-server-1.8.3-r2.ebuild:
+  Remove old
 
   02 Jun 2007; Brent Baude <ranger@gentoo.org>
   evolution-data-server-1.8.3-r4.ebuild:
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.8.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.8.2.ebuild
deleted file mode 100644
index 008b0379d09f..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.8.2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2007 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.8.2.ebuild,v 1.10 2007/01/28 07:39:29 vapier Exp $
-
-WANT_AUTOMAKE="1.9"
-WANT_AUTOCONF="latest"
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 Sleepycat"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="doc ipv6 kerberos keyring krb4 ldap nntp ssl"
-
-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
-	>=gnome-base/gnome-common-2
-	keyring? ( gnome-base/gnome-keyring )
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=net-libs/libsoup-2.2.90
-	sys-libs/zlib
-	=sys-libs/db-4*
-	ldap? ( >=net-nds/openldap-2.0 )
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-RESTRICT="confcache"
-
-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 keyring gnome-keyring)		\
-		--with-libdb=/usr/$(get_libdir)"
-
-	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() {
-	gnome2_src_unpack
-
-	epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
-
-	# Fix broken libdb build
-	epatch "${FILESDIR}"/${PN}-1.7.3-libdb.patch
-
-	# Resolve symbols at execution time for setgid binaries
-	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
-
-	# exchange-storage --as-needed fixes
-	epatch "${FILESDIR}"/${PN}-1.7.3-exchange-storage.patch
-	epatch "${FILESDIR}"/${PN}-1.7.4-move-subdirs.patch
-
-	# Rewind in camel-disco-diary to fix a crash
-	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
-
-#-------------Upstream GNOME look here -----------------#
-
-	# fix for dep ordering so we can add libedataserverui to libexchange-storage
-	# we need to do this or: undefined reference to `e_passwords_get_password'
-	# are the kinds of errors you will get.
-
-	# move the groupwise backend and provider for addressbook, camel, and
-	# calendar to its own folder called server.deps.
-	mkdir server.deps
-	mv addressbook/backends/groupwise server.deps/addressbook
-	mv camel/providers/groupwise server.deps/camel
-	mv calendar/backends/groupwise server.deps/calendar
-
-	# now fix the autotools foo for the new directory and the removed ones
-	echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am
-
-	# remove groupwise folder from Makefile's since they are in a diff location
-	sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am
-
-	# fix configure.in location of the Makefile's
-	sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in
-	sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in
-	# tack on the server.deps Makefile on our last edit
-	sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in
-
-	# fix file includes 
-	sed -i -e 's:<backends/groupwise/e-book-backend-groupwise.h>:"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c
-
-#---------------Upstream GNOME stop here---------------
-	eautoreconf
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		NSS_LIB=/usr/$(get_libdir)/nss
-		NSS_INC=/usr/include/nss
-		NSPR_LIB=/usr/$(get_libdir)/nspr
-		NSPR_INC=/usr/include/nspr
-
-		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}"
-	gnome2_src_compile
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r1.ebuild
deleted file mode 100644
index ada976137a6a..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2007 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.8.3-r1.ebuild,v 1.2 2007/04/18 08:56:09 uberlord Exp $
-
-WANT_AUTOMAKE="1.9"
-WANT_AUTOCONF="latest"
-inherit db-use eutils flag-o-matic gnome2 autotools
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 Sleepycat"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc ipv6 kerberos keyring krb4 ldap nntp ssl"
-
-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
-	>=gnome-base/gnome-common-2
-	keyring? ( gnome-base/gnome-keyring )
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=net-libs/libsoup-2.2.90
-	sys-libs/zlib
-	=sys-libs/db-4*
-	ldap? ( >=net-nds/openldap-2.0 )
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-RESTRICT="confcache"
-
-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 keyring gnome-keyring)		\
-		--with-libdb=/usr/$(get_libdir)"
-
-	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() {
-	gnome2_src_unpack
-
-	epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
-
-	# Fix broken libdb build
-	epatch "${FILESDIR}"/${PN}-1.7.3-libdb.patch
-
-	# Resolve symbols at execution time for setgid binaries
-	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
-
-	# exchange-storage --as-needed fixes
-	epatch "${FILESDIR}"/${PN}-1.7.3-exchange-storage.patch
-	epatch "${FILESDIR}"/${PN}-1.7.4-move-subdirs.patch
-
-	# Rewind in camel-disco-diary to fix a crash
-	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
-
-	# Fix non-english contact insertion.  Upstream bug:
-	# http://bugzilla.gnome.org/show_bug.cgi?id=405531
-	epatch "${FILESDIR}"/${P}-category.patch
-
-#-------------Upstream GNOME look here -----------------#
-
-	# fix for dep ordering so we can add libedataserverui to libexchange-storage
-	# we need to do this or: undefined reference to `e_passwords_get_password'
-	# are the kinds of errors you will get.
-
-	# move the groupwise backend and provider for addressbook, camel, and
-	# calendar to its own folder called server.deps.
-	mkdir server.deps
-	mv addressbook/backends/groupwise server.deps/addressbook
-	mv camel/providers/groupwise server.deps/camel
-	mv calendar/backends/groupwise server.deps/calendar
-
-	# now fix the autotools foo for the new directory and the removed ones
-	echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am
-
-	# remove groupwise folder from Makefile's since they are in a diff location
-	sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am
-
-	# fix configure.in location of the Makefile's
-	sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in
-	sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in
-	# tack on the server.deps Makefile on our last edit
-	sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in
-
-	# fix file includes
-	sed -i -e 's:<backends/groupwise/e-book-backend-groupwise.h>:"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c
-
-	# Fix db version for FreeBSD users where -ldb is always db-1
-	sed -i -e "s:-ldb:-l$(db_libname):" configure.in
-
-#---------------Upstream GNOME stop here---------------
-	eautoreconf
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		NSS_LIB=/usr/$(get_libdir)/nss
-		NSS_INC=/usr/include/nss
-		NSPR_LIB=/usr/$(get_libdir)/nspr
-		NSPR_INC=/usr/include/nspr
-
-		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
-
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	cd "${S}"
-	gnome2_src_compile
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r2.ebuild
deleted file mode 100644
index 715e20618bf7..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2007 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.8.3-r2.ebuild,v 1.2 2007/04/18 08:56:09 uberlord Exp $
-
-WANT_AUTOMAKE="1.9"
-WANT_AUTOCONF="latest"
-inherit db-use eutils flag-o-matic gnome2 autotools
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 Sleepycat"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc ipv6 kerberos keyring krb4 ldap nntp ssl"
-
-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
-	>=gnome-base/gnome-common-2
-	keyring? ( gnome-base/gnome-keyring )
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=net-libs/libsoup-2.2.90
-	sys-libs/zlib
-	=sys-libs/db-4*
-	ldap? ( >=net-nds/openldap-2.0 )
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-RESTRICT="confcache"
-
-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 keyring gnome-keyring)		\
-		--with-libdb=/usr/$(get_libdir)"
-
-	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() {
-	gnome2_src_unpack
-
-	epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
-
-	# Fix broken libdb build
-	epatch "${FILESDIR}"/${PN}-1.7.3-libdb.patch
-
-	# Resolve symbols at execution time for setgid binaries
-	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
-
-	# exchange-storage --as-needed fixes
-	epatch "${FILESDIR}"/${PN}-1.7.3-exchange-storage.patch
-	epatch "${FILESDIR}"/${PN}-1.7.4-move-subdirs.patch
-
-	# Rewind in camel-disco-diary to fix a crash
-	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
-
-	# Fix non-english contact insertion.  Upstream bug:
-	# http://bugzilla.gnome.org/show_bug.cgi?id=405531
-	epatch "${FILESDIR}"/${P}-category.patch
-
-	# Fix DST changes; bug #172835
-	epatch "${FILESDIR}"/${P}-dst.patch.gz
-
-#-------------Upstream GNOME look here -----------------#
-
-	# fix for dep ordering so we can add libedataserverui to libexchange-storage
-	# we need to do this or: undefined reference to `e_passwords_get_password'
-	# are the kinds of errors you will get.
-
-	# move the groupwise backend and provider for addressbook, camel, and
-	# calendar to its own folder called server.deps.
-	mkdir server.deps
-	mv addressbook/backends/groupwise server.deps/addressbook
-	mv camel/providers/groupwise server.deps/camel
-	mv calendar/backends/groupwise server.deps/calendar
-
-	# now fix the autotools foo for the new directory and the removed ones
-	echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am
-
-	# remove groupwise folder from Makefile's since they are in a diff location
-	sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am
-
-	# fix configure.in location of the Makefile's
-	sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in
-	sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in
-	# tack on the server.deps Makefile on our last edit
-	sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in
-
-	# fix file includes
-	sed -i -e 's:<backends/groupwise/e-book-backend-groupwise.h>:"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c
-
-	# Fix db version for FreeBSD users where -ldb is always db-1
-	sed -i -e "s:-ldb:-l$(db_libname):" configure.in
-
-#---------------Upstream GNOME stop here---------------
-	eautoreconf
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		NSS_LIB=/usr/$(get_libdir)/nss
-		NSS_INC=/usr/include/nss
-		NSPR_LIB=/usr/$(get_libdir)/nspr
-		NSPR_INC=/usr/include/nspr
-
-		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
-
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	cd "${S}"
-	gnome2_src_compile
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.8.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.8.3.ebuild
deleted file mode 100644
index eb2ecfc28142..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.8.3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2007 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.8.3.ebuild,v 1.2 2007/04/18 08:56:09 uberlord Exp $
-
-WANT_AUTOMAKE="1.9"
-WANT_AUTOCONF="latest"
-inherit db-use eutils flag-o-matic gnome2 autotools
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 Sleepycat"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc ipv6 kerberos keyring krb4 ldap nntp ssl"
-
-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
-	>=gnome-base/gnome-common-2
-	keyring? ( gnome-base/gnome-keyring )
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=net-libs/libsoup-2.2.90
-	sys-libs/zlib
-	=sys-libs/db-4*
-	ldap? ( >=net-nds/openldap-2.0 )
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-RESTRICT="confcache"
-
-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 keyring gnome-keyring)		\
-		--with-libdb=/usr/$(get_libdir)"
-
-	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() {
-	gnome2_src_unpack
-
-	epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
-
-	# Fix broken libdb build
-	epatch "${FILESDIR}"/${PN}-1.7.3-libdb.patch
-
-	# Resolve symbols at execution time for setgid binaries
-	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
-
-	# exchange-storage --as-needed fixes
-	epatch "${FILESDIR}"/${PN}-1.7.3-exchange-storage.patch
-	epatch "${FILESDIR}"/${PN}-1.7.4-move-subdirs.patch
-
-	# Rewind in camel-disco-diary to fix a crash
-	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
-
-#-------------Upstream GNOME look here -----------------#
-
-	# fix for dep ordering so we can add libedataserverui to libexchange-storage
-	# we need to do this or: undefined reference to `e_passwords_get_password'
-	# are the kinds of errors you will get.
-
-	# move the groupwise backend and provider for addressbook, camel, and
-	# calendar to its own folder called server.deps.
-	mkdir server.deps
-	mv addressbook/backends/groupwise server.deps/addressbook
-	mv camel/providers/groupwise server.deps/camel
-	mv calendar/backends/groupwise server.deps/calendar
-
-	# now fix the autotools foo for the new directory and the removed ones
-	echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am
-
-	# remove groupwise folder from Makefile's since they are in a diff location
-	sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am
-
-	# fix configure.in location of the Makefile's
-	sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in
-	sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in
-	# tack on the server.deps Makefile on our last edit
-	sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in
-
-	# fix file includes
-	sed -i -e 's:<backends/groupwise/e-book-backend-groupwise.h>:"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c
-
-	# Fix db version for FreeBSD users where -ldb is always db-1
-	sed -i -e "s:-ldb:-l$(db_libname):" configure.in
-
-#---------------Upstream GNOME stop here---------------
-	eautoreconf
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		NSS_LIB=/usr/$(get_libdir)/nss
-		NSS_INC=/usr/include/nss
-		NSPR_LIB=/usr/$(get_libdir)/nspr
-		NSPR_INC=/usr/include/nspr
-
-		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
-
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	cd "${S}"
-	gnome2_src_compile
-}
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.2 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.2
deleted file mode 100644
index 7dabc9ec79bc..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fe7545411f7417bd246e15ae07ae9f54 evolution-data-server-1.8.2.tar.bz2 6963774
-RMD160 b3ae6d2dafa0abbbaf5ffe2fbdc39b6b20fe762d evolution-data-server-1.8.2.tar.bz2 6963774
-SHA256 63a765c237504ed34344f7ef505c495d9a40c6022b7d69ca6ded32016508fecd evolution-data-server-1.8.2.tar.bz2 6963774
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3
deleted file mode 100644
index 0defb70b07af..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f6a824f2553fd97555b8785a452fb6ab evolution-data-server-1.8.3.tar.bz2 7024111
-RMD160 8051f35a0db514f919bf730cd35c37ea75029061 evolution-data-server-1.8.3.tar.bz2 7024111
-SHA256 cbc067d87722afef84e8c4914787d990015e0c69b3bf3576fc15c8193ffd2fcc evolution-data-server-1.8.3.tar.bz2 7024111
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r1
deleted file mode 100644
index 0defb70b07af..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f6a824f2553fd97555b8785a452fb6ab evolution-data-server-1.8.3.tar.bz2 7024111
-RMD160 8051f35a0db514f919bf730cd35c37ea75029061 evolution-data-server-1.8.3.tar.bz2 7024111
-SHA256 cbc067d87722afef84e8c4914787d990015e0c69b3bf3576fc15c8193ffd2fcc evolution-data-server-1.8.3.tar.bz2 7024111
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r2 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r2
deleted file mode 100644
index 0defb70b07af..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f6a824f2553fd97555b8785a452fb6ab evolution-data-server-1.8.3.tar.bz2 7024111
-RMD160 8051f35a0db514f919bf730cd35c37ea75029061 evolution-data-server-1.8.3.tar.bz2 7024111
-SHA256 cbc067d87722afef84e8c4914787d990015e0c69b3bf3576fc15c8193ffd2fcc evolution-data-server-1.8.3.tar.bz2 7024111