bump to 1.12.3 and clean up old revisions

(Portage version: 2.1.4)

17 files changed, 27 insertions, 543 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index fa2b3b362ea2..7b8f9c92ea6a 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,23 @@
 # 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.163 2007/12/10 00:13:36 eva Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.164 2008/01/20 10:51:13 eva Exp $
+
+*evolution-data-server-1.12.3 (20 Jan 2008)
+
+  20 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch,
+  -files/evolution-data-server-1.7.3-exchange-storage.patch,
+  -files/evolution-data-server-1.7.4-move-subdirs.patch,
+  -files/evolution-data-server-1.8.3-category.patch,
+  -files/evolution-data-server-1.8.3-dst.patch.gz,
+  -files/evolution-data-server-1.10.1-imap-overflow.patch,
+  -files/evolution-data-server-APOP-auth-fix.patch,
+  -evolution-data-server-1.6.2-r1.ebuild,
+  -evolution-data-server-1.8.3-r5.ebuild,
+  -evolution-data-server-1.10.2.ebuild,
+  -evolution-data-server-1.12.0.ebuild,
+  +evolution-data-server-1.12.3.ebuild:
+  bump to 1.12.3 and clean up old revisions
 
 *evolution-data-server-1.12.2-r1 (09 Dec 2007)
 
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.10.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.10.2.ebuild
deleted file mode 100644
index 2793ead4ab85..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.10.2.ebuild
+++ /dev/null
@@ -1,136 +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.10.2.ebuild,v 1.12 2007/10/12 14:28:30 eva Exp $
-
-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 ssl"
-
-RDEPEND=">=dev-libs/glib-2.10
-	>=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.5
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-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 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
-
-	# Fix what ?
-	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
-
-	# Rewind in camel-disco-diary to fix a crash
-	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
-
-#-------------Upstream GNOME look here -----------------#
-
-	# --as-needed fixes
-	epatch "${FILESDIR}"/${PN}-1.9.91-as-needed.patch
-
-	# 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
-		sed -i -e "s|mozilla-nss|nss|
-		s|mozilla-nspr|nspr|" "${S}"/configure
-		G2CONF="${G2CONF} --enable-nss=yes"
-	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.12.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild
index 3ebe0ea4eb6c..f08614ce81cc 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.12.0.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.12.0.ebuild,v 1.3 2007/10/12 14:28:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild,v 1.1 2008/01/20 10:51:13 eva Exp $
 
 inherit db-use eutils flag-o-matic gnome2 autotools
 
@@ -77,6 +77,9 @@ src_unpack() {
 	# Rewind in camel-disco-diary to fix a crash
 	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
 
+	# Don't assume that endian.h and byteswap.h exist on all non sun os's
+	epatch "${FILESDIR}"/${PN}-1.12.1-icaltz-util.patch
+
 #-------------Upstream GNOME look here -----------------#
 
 	# --as-needed fixes
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.6.2-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.6.2-r1.ebuild
deleted file mode 100644
index b7a0cdd8deb4..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,108 +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.6.2-r1.ebuild,v 1.11 2007/08/25 14:19:59 vapier 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 ppc ppc64 sparc x86"
-IUSE="doc ipv6 kerberos 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
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=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 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.28
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-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)"
-
-	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
-
-	# Fix calandar crashing, bug #86174
-	epatch "${FILESDIR}"/${PN}-1.4.2.1-calandar-crash-fix.patch
-
-	# Resolve symbols at execution time for setgid binaries
-	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
-
-	# Fix vulnerability in IMAP; bug #182011
-	epatch "${FILESDIR}"/${PN}-1.10.1-imap-overflow.patch
-
-	sed -n -e '/GNOME_COMPILE_WARNINGS/,/dnl IT_PROG_INTLTOOL/p' \
-		aclocal.m4 > gnome.m4
-	export WANT_AUTOMAKE=1.9
-	aclocal -I . || die "aclocal failed"
-	automake || die "automake failed"
-}
-
-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}/libdb/dist"
-	./s_config || die
-
-	cd "${S}"
-	gnome2_src_compile
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r5.ebuild
deleted file mode 100644
index 847a3fb70438..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r5.ebuild
+++ /dev/null
@@ -1,160 +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-r5.ebuild,v 1.11 2007/08/25 14:19:59 vapier 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"
-
-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
-
-	# Fix vulnerability in APOP authentification; bug #174210
-	epatch "${FILESDIR}"/${PN}-APOP-auth-fix.patch
-
-	# Fix vulnerability in IMAP; bug #182011
-	epatch "${FILESDIR}"/${PN}-1.10.1-imap-overflow.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.10.2 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.2
deleted file mode 100644
index aad1499927d0..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 790dfc97a917dff8384dcb7cad42f87f evolution-data-server-1.10.2.tar.bz2 7122238
-RMD160 1fc5915338427a306e46a1c37bfc913fa05936a3 evolution-data-server-1.10.2.tar.bz2 7122238
-SHA256 dc9772f92818c1846127df32524caaa4c266460af5bbd0e2254d0dba4fa36432 evolution-data-server-1.10.2.tar.bz2 7122238
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.0 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.0
deleted file mode 100644
index 98f49a78cb40..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 787cfe9d652f46395a9adce056bdb286 evolution-data-server-1.12.0.tar.bz2 7463329
-RMD160 f58e5cff47cb1d1937a6fba5b7c6408e3da725ed evolution-data-server-1.12.0.tar.bz2 7463329
-SHA256 854435b58756b365b978f1433bee026d4f5f2973e0c1c2ea279cd2c7c0e8f5f3 evolution-data-server-1.12.0.tar.bz2 7463329
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.3 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.3
new file mode 100644
index 000000000000..795c4a811ef1
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.3
@@ -0,0 +1,3 @@
+MD5 9a04e379c34ad538764866dfd4eb2931 evolution-data-server-1.12.3.tar.bz2 7447166
+RMD160 c7102c38af4888f3f8933c9d28981d1809d504f8 evolution-data-server-1.12.3.tar.bz2 7447166
+SHA256 e2d9038e3cd115ea5af2f3b7d381f5803c62d1ec36206e5a1bea0f823d25fab5 evolution-data-server-1.12.3.tar.bz2 7447166
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.6.2-r1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.6.2-r1
deleted file mode 100644
index e496e60a0ad0..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.6.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 165f493eec8a2c8fc6eca3fdeb8c4885 evolution-data-server-1.6.2.tar.bz2 7179353
-RMD160 59af916ab4a9fabc14c65c16189188f829459985 evolution-data-server-1.6.2.tar.bz2 7179353
-SHA256 3b02b940aaa90034609b9401d3da586e5439363ade9bf8d7fc562acacd28bfde evolution-data-server-1.6.2.tar.bz2 7179353
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r5 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r5
deleted file mode 100644
index 0defb70b07af..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r5
+++ /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/evolution-data-server-1.10.1-imap-overflow.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.10.1-imap-overflow.patch
deleted file mode 100644
index 7a241c1731a4..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.10.1-imap-overflow.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-1.10.1.orig/camel/providers/imap/camel-imap-folder.c evolution-data-server-1.10.1/camel/providers/imap/camel-imap-folder.c
---- evolution-data-server-1.10.1.orig/camel/providers/imap/camel-imap-folder.c	2007-04-09 08:42:39.000000000 -0400
-+++ evolution-data-server-1.10.1/camel/providers/imap/camel-imap-folder.c	2007-06-14 13:02:54.000000000 -0400
-@@ -655,7 +655,7 @@ imap_rescan (CamelFolder *folder, int ex
- 		uid = g_datalist_get_data (&data, "UID");
- 		flags = GPOINTER_TO_UINT (g_datalist_get_data (&data, "FLAGS"));
- 		
--		if (!uid || !seq || seq > summary_len) {
-+		if (!uid || !seq || seq > summary_len || seq < 0) {
- 			g_datalist_clear (&data);
- 			continue;
- 		}
-@@ -2789,7 +2789,7 @@ parse_fetch_response (CamelImapFolder *i
- 		
- 		if (*response != '*' || *(response + 1) != ' ')
- 			return NULL;
--		seq = strtol (response + 2, &response, 10);
-+		seq = strtoul (response + 2, &response, 10);
- 		if (seq == 0)
- 			return NULL;
- 		if (g_ascii_strncasecmp (response, " FETCH (", 8) != 0)
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch
deleted file mode 100644
index 077168b24419..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-data-server-1.4.2.1.orig/calendar/libecal/e-cal-recur.c evolution-data-server-1.4.2.1/calendar/libecal/e-cal-recur.c
---- evolution-data-server-1.4.2.1.orig/calendar/libecal/e-cal-recur.c	2005-09-02 10:37:43.000000000 -0400
-+++ evolution-data-server-1.4.2.1/calendar/libecal/e-cal-recur.c	2006-01-08 16:31:12.000000000 -0500
-@@ -683,7 +683,7 @@
- 					gpointer	            tz_cb_data,
- 					icaltimezone	 *default_timezone)
- {
--	ECalComponentDateTime dtstart, dtend;
-+	ECalComponentDateTime dtstart = {0}, dtend = {0};
- 	time_t dtstart_time, dtend_time;
- 	GSList *rrules = NULL, *rdates = NULL, elem;
- 	GSList *exrules = NULL, *exdates = NULL;
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.3-exchange-storage.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.3-exchange-storage.patch
deleted file mode 100644
index bf0fe7a56dee..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.3-exchange-storage.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-data-server-1.7.3.orig/configure.in evolution-data-server-1.7.3/configure.in
---- evolution-data-server-1.7.3.orig/configure.in	2006-06-12 10:27:29.000000000 -0400
-+++ evolution-data-server-1.7.3/configure.in	2006-07-07 10:22:49.000000000 -0400
-@@ -950,19 +950,23 @@
- msg_krb5="no"
- if test "x${with_krb5}" != "xno"; then
- 	LDFLAGS_save="$LDFLAGS"
-+	SAVE_LIBS="$LIBS"
- 	
- 	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
- 	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
- 	AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
- 	[
--		LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs"
-+		LDFLAGS="$LDFLAGS -L$with_krb5_libs"
-+		LIBS="$SAVE_LIBS $mitlibs"
- 		AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
- 		[
--			LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs"
-+			LDFLAGS="$LDFLAGS_save -L$with_krb5_libs"
-+			LIBS="$SAVE_LIBS $heimlibs"
- 			AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", ac_cv_lib_kerberos5="no")
- 		])
--		LDFLAGS="$LDFLAGS_save"
- 	])
-+	LDFLAGS="$LDFLAGS_save"
-+	LIBS="$SAVE_LIBS"
- 	if test "$ac_cv_lib_kerberos5" != "no"; then
- 		AC_DEFINE(HAVE_KRB5,1,[Define if you have Krb5])
- 		if test "$ac_cv_lib_kerberos5" = "$mitlibs"; then
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.4-move-subdirs.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.4-move-subdirs.patch
deleted file mode 100644
index 13fc81a19dcb..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.4-move-subdirs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-data-server-1.7.4.orig/Makefile.am evolution-data-server-1.7.4/Makefile.am
---- evolution-data-server-1.7.4.orig/Makefile.am	2006-04-24 06:39:59.000000000 -0400
-+++ evolution-data-server-1.7.4/Makefile.am	2006-07-20 18:15:50.000000000 -0400
-@@ -5,8 +5,8 @@
- LIBDB = libdb
- endif
- 
--SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
--DIST_SUBDIRS= win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
-+SUBDIRS = $(LIBDB) win32 libedataserver camel addressbook calendar libedataserverui servers server.deps src docs art po
-+DIST_SUBDIRS= win32 libedataserver camel addressbook calendar libedataserverui servers server.deps src docs art po
- 
- changelogs =			\
- 	ChangeLog
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-category.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-category.patch
deleted file mode 100644
index dd1943ec838e..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-category.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN evolution-data-server-1.8.3.orig/libedataserverui/e-name-selector-dialog.c evolution-data-server-1.8.3/libedataserverui/e-name-selector-dialog.c
---- evolution-data-server-1.8.3.orig/libedataserverui/e-name-selector-dialog.c	2007-01-29 04:44:33.000000000 -0500
-+++ evolution-data-server-1.8.3/libedataserverui/e-name-selector-dialog.c	2007-03-01 13:28:12.000000000 -0500
-@@ -779,7 +779,7 @@ search_changed (ENameSelectorDialog *nam
- 	text = gtk_entry_get_text (name_selector_dialog->search_entry);
- 	text_escaped = escape_sexp_string (text);
- 
--	if ( !strcmp (category,"Any Category")) {
-+	if ( !strcmp (category, _("Any Category"))) {
- 		query_string = g_strdup_printf ("(or (beginswith \"file_as\" %s) "
- 						"    (beginswith \"full_name\" %s) "
- 						"    (beginswith \"email\" %s) "
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-dst.patch.gz b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-dst.patch.gz
deleted file mode 100644
index a5705b6b377b..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-dst.patch.gz
+++ /dev/null
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch
deleted file mode 100644
index 301bfe3b4399..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur evolution-data-server-1.8.3.orig/camel/providers/pop3/camel-pop3-store.c evolution-data-server-1.8.3/camel/providers/pop3/camel-pop3-store.c
---- evolution-data-server-1.8.3.orig/camel/providers/pop3/camel-pop3-store.c	2007-05-03 15:43:23.000000000 +0400
-+++ evolution-data-server-1.8.3/camel/providers/pop3/camel-pop3-store.c	2007-05-03 15:49:15.000000000 +0400
-@@ -34,6 +34,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <ctype.h>
- 
- #include "camel-operation.h"
- 
-@@ -489,7 +490,21 @@
- 	} else if (strcmp(service->url->authmech, "+APOP") == 0 && store->engine->apop) {
- 		char *secret, md5asc[33], *d;
- 		unsigned char md5sum[16], *s;
--		
-+
-+		d = store->engine->apop;
-+
-+		while (*d != '\0') {
-+			if (!isascii((int)*d)) {
-+
-+				camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-+						_("Could not connect to POP server %s"),
-+						CAMEL_SERVICE (store)->url->host);
-+
-+				return FALSE;
-+			}
-+			d++;
-+		}
-+
- 		secret = g_alloca(strlen(store->engine->apop)+strlen(service->url->passwd)+1);
- 		sprintf(secret, "%s%s",  store->engine->apop, service->url->passwd);
- 		md5_get_digest(secret, strlen (secret), md5sum);