gnome 2.8 commit, fix up older ebuilds

11 files changed, 35 insertions, 1025 deletions

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index c6eec8fdc89d..9a0e977c67e3 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,22 +1,16 @@
-MD5 03921668155f28ca44d0d81cfb9d0555 ChangeLog 18217
 MD5 dad6657ce9376178fb561002aa40f5e0 evolution-1.2.4.ebuild 6251
-MD5 dd3e30cf2ae2af39f7fce74a047317ee evolution-1.4.5.ebuild 5740
-MD5 8358897fdee4e24d373ddd74db7a8cf9 evolution-1.4.6.ebuild 5472
-MD5 5bf9b0c82ec93e2e1041a23157ebe8d1 evolution-1.5.92.1.ebuild 3600
-MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
-MD5 f61a504f8baa06daa3e77bd4d4b34c15 evolution-1.5.93.ebuild 3723
+MD5 cad29bdd915dcf46216ca6181333da48 evolution-2.0.0.ebuild 3671
 MD5 95935dc6b1b6ab4f78027ea86e33069f evolution-1.5.94.1.ebuild 3717
-MD5 3137288dd17e357d0972dab00e4f6b6d files/digest-evolution-1.2.4 1230
-MD5 49463c08f32ee1df0970196b6c4cef2b files/digest-evolution-1.4.5 132
-MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
-MD5 eb83bc7208b2fc2063f030dce73eb15e files/digest-evolution-1.5.92.1 73
+MD5 695fe06900b7d3d3cfacb97437cd3b7b evolution-1.4.6.ebuild 5465
+MD5 03921668155f28ca44d0d81cfb9d0555 ChangeLog 18217
+MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
+MD5 49ed705f94911bcb89d2bd9d7fedbc2e files/digest-evolution-1.5.94.1 73
+MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
-MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
 MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
-MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
-MD5 d863019d9fb9a8f74c5090de0f1ceee4 files/evolution-1.4.5-gtk-2.4.patch 26799
-MD5 6174a41481c88eb948a8e119cf93ea94 files/evolution-1.4.5-nztimezone.patch 1852
-MD5 4df81c3442025403034c53975ba663b1 files/evolution-gcc34.patch 3044
-MD5 63aaa2baf8d7107a3a4c08c4c85efcec files/digest-evolution-1.5.93 71
 MD5 6e58f5e7a4195267cc545d8c9eba07a3 files/evolution-1.5.93-addressbooklibs.patch 564
-MD5 49ed705f94911bcb89d2bd9d7fedbc2e files/digest-evolution-1.5.94.1 73
+MD5 3137288dd17e357d0972dab00e4f6b6d files/digest-evolution-1.2.4 1230
+MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
+MD5 c99745f20c250a825bdda526f4209210 files/digest-evolution-2.0.0 70
+MD5 4df81c3442025403034c53975ba663b1 files/evolution-gcc34.patch 3044
+MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
diff --git a/mail-client/evolution/evolution-1.4.5.ebuild b/mail-client/evolution/evolution-1.4.5.ebuild
deleted file mode 100644
index 0fda22989e91..000000000000
--- a/mail-client/evolution/evolution-1.4.5.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.4.5.ebuild,v 1.6 2004/08/22 05:09:37 obz Exp $
-
-# kde before gnome2, otherwise kde_src_install will override gnome2_src_install
-use kde && inherit kde
-inherit flag-o-matic virtualx gnome2 eutils
-
-# problems with -O3 on gcc-3.3.1
-replace-flags -O3 -O2
-
-DB3="db-3.1.17"
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="${SRC_URI} http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-
-IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde crypt"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc hppa alpha amd64"
-
-# Top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.0.9
-	>=gnome-extra/gal-1.99.10
-	>=net-libs/libsoup-1.99.26
-	>=gnome-extra/yelp-2.2
-	pda? ( >=app-pda/gnome-pilot-2.0.10-r1
-	       >=app-pda/pilot-link-0.11.8
-	       >=app-pda/gnome-pilot-conduits-2.0.10-r1 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	>=gnome-base/orbit-2.8.2
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/gnome-vfs-2.0
-	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libgnome-2.0
-	>=dev-libs/libxml2-2.5
-	>=gnome-base/gconf-2.0
-	>=gnome-base/libgnomecanvas-2.2.0.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-base/libgnomeprint-2.2
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( mozilla? ( || ( ( >=dev-libs/nspr-4.3 >=dev-libs/nss-3.8 )
-	                       net-www/mozilla
-	                     )
-	                ) )
-	ssl? ( !mozilla? ( >=dev-libs/openssl-0.9.5 ) )
-	ldap? ( >=net-nds/openldap-2.0 )
-	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
-	doc? ( >=app-text/scrollkeeper-0.3.10-r1 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig
-	>=sys-devel/libtool-1.4.1-r1
-	>=dev-util/intltool-0.20
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )"
-
-pkg_setup() {
-	if [ -x ${ROOT}/usr/bin/evolution-1.3 ]; then
-		eerror "Please un-merge the 1.3 Development Versions of Ximian Evolution."
-		eerror "You can do this by doing:"
-		eerror ""
-		eerror "   emerge -C \"=mail-client/evolution-1.3*\""
-		eerror ""
-		die "unmerge evolution-1.3 before installing evolution-1.4"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Remove dependency on libdb1.so (its deprecated)
-	cd ${S}; sed -i -e "s/-ldb1//" configure
-
-	# We need the omf fix, or else we get access violation
-	# errors related to sandbox
-	gnome2_omf_fix ${S}/help/C/Makefile.in
-
-	# Patch for 64-bit ... should be retired for 1.5 which contains
-	# the patch upstream
-	epatch ${FILESDIR}/evolution-1.4.4-alpha.patch
-	# Patch backported from CVS. Fixes NZDT (UTC+13) timezone on emails
-	# http://bugzilla.ximian.com/show_bug.cgi?id=49357
-	cd ${S}/camel; epatch ${FILESDIR}/${P}-nztimezone.patch
-
-	cd ${S}
-	# fix gtk+-2.4 build (#49265)
-	epatch ${FILESDIR}/${P}-gtk-2.4.patch
-
-}
-
-##### Compile evolution specific db3 for static linking #####
-src_compile_db3() {
-	einfo "Compiling DB3..."
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-
-	# Rather ugly hack to make sure pthread mutex support are not enabled ...
-	if [ -n "`egrep "^LIBS=[[:space:]]*-lpthread" Makefile`" ];  then
-		append-flags "-pthread"
-	fi
-
-	make || die "db make failed"
-	make prefix=${WORKDIR}/db3 install || die "db install failed"
-
-}
-
-src_compile() {
-	elibtoolize
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	# Compile evo specific version of db3
-	src_compile_db3
-
-	einfo "Compiling Evolution..."
-	cd ${S}
-
-	local myconf=
-
-	use pda \
-		&& myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes" \
-		|| myconf="${myconf} --enable-pilot-conduits=no"
-
-	use ldap \
-		&&	myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
-		|| myconf="${myconf} --with-openldap=no"
-
-	use kerberos \
-		&& myconf="${myconf} --with-krb5=/usr" \
-		|| myconf="${myconf} --without-krb5"
-
-	use doc \
-		&& myconf="${myconf} --enable-gtk-doc" \
-		|| myconf="${myconf} --disable-gtk-doc"
-
-	use ipv6 \
-		&& myconf="${myconf} --enable-ipv6=yes" \
-		|| myconf="${myconf} --enable-ipv6=no"
-
-	use kde && [ -n "${KDEDIR}" ] \
-		&& myconf="${myconf} --with-kde-applnk-path=${KDEDIR}/share/applnk"
-
-	# Use Mozilla NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
-	if use ssl && use mozilla; then
-		if has_version "dev-libs/nspr"; then
-			NSS_LIB=/usr/lib
-			NSS_INC=/usr/include
-		elif has_version "net-www/mozilla"; then
-			NSS_LIB=/usr/lib/mozilla
-			NSS_INC=/usr/lib/mozilla/include
-		else
-			eerror "Neither net-www/mozilla nor dev-libs/nspr found."
-			die "unexpected error. unable to find nss/nspr"
-		fi
-
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${NSS_INC}/nspr \
-			--with-nspr-libs=${NSS_LIB} \
-			--with-nss-includes=${NSS_INC}/nss \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# Else use OpenSSL if 'mozilla' not in USE  ...
-	if use ssl && ! use mozilla; then
-		myconf="${myconf} --enable-openssl=yes"
-	fi
-
-	econf --with-db3=${WORKDIR}/db3 ${myconf} || die
-
-	# Needs to be able to connect to X display to build.
-	Xemake || Xmake || die "make failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	einfo "To change the default browser if you are not using GNOME, do:"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-}
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
diff --git a/mail-client/evolution/evolution-1.4.6.ebuild b/mail-client/evolution/evolution-1.4.6.ebuild
index 630642688a25..c11062c9dced 100644
--- a/mail-client/evolution/evolution-1.4.6.ebuild
+++ b/mail-client/evolution/evolution-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.4.6.ebuild,v 1.11 2004/08/22 05:09:37 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.4.6.ebuild,v 1.12 2004/09/17 13:58:53 foser Exp $
 
 inherit flag-o-matic virtualx gnome2 eutils
 
@@ -18,9 +18,9 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc hppa alpha amd64 ia64"
 
 # Top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.0.10
-	>=gnome-extra/gal-1.99.11
-	>=net-libs/libsoup-1.99.28
+RDEPEND="=gnome-extra/libgtkhtml-3.0*
+	=gnome-extra/gal-1.99*
+	=net-libs/libsoup-1.99*
 	>=gnome-extra/yelp-2.2
 	pda? ( >=app-pda/gnome-pilot-2.0.10-r1
 	       >=app-pda/pilot-link-0.11.8
diff --git a/mail-client/evolution/evolution-1.5.92.1.ebuild b/mail-client/evolution/evolution-1.5.92.1.ebuild
deleted file mode 100644
index 7267906a015b..000000000000
--- a/mail-client/evolution/evolution-1.5.92.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.5.92.1.ebuild,v 1.4 2004/08/25 11:35:47 tseng Exp $
-
-inherit eutils virtualx gnome2 debug flag-o-matic
-
-# problems with -O3 on gcc-3.3.1
-replace-flags -O3 -O2
-
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-HOMEPAGE="http://ximian.com/products/evolution/"
-
-LICENSE="GPL-2"
-SLOT="2.0"
-KEYWORDS="~x86"
-IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda"
-RESTRICT="nomirror"
-
-# Top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.1.19
-	>=gnome-extra/gal-2.1.13
-	>=gnome-extra/evolution-data-server-0.0.97
-	>=net-libs/libsoup-2.1.12
-	>=dev-libs/glib-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=gnome-extra/yelp-2.5.1
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/libgnomecanvas-2.0
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2
-	>=gnome-base/libgnomeprintui-2
-	>=x11-themes/gnome-icon-theme-1.2
-	>=gnome-base/orbit-2.9.8
-	pda? ( >=app-pda/gnome-pilot-2.0.10
-			>=app-pda/gnome-pilot-conduits-2.0.10 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( mozilla? ( net-www/mozilla )
-		   !mozilla? ( >=dev-libs/nspr-4.3
-						>=dev-libs/nss-3.8 ) )
-	ldap? ( >=net-nds/openldap-2.0 )
-	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig
-	>=sys-devel/libtool-1.4.1-r1
-	>=dev-util/intltool-0.30
-	sys-devel/gettext
-	sys-devel/bison
-	doc? ( dev-util/gtk-doc
-		>=app-text/scrollkeeper-0.3.10-r1 )"
-
-G2CONF="--disable-default-binary \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_enable ipv6) \
-		$(use_enable nntp) \
-		$(use_enable pda pilot-conduits)"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
-
-
-src_compile() {
-	elibtoolize
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	einfo "Compiling Evolution..."
-	cd ${S}
-	local myconf=""
-
-	use ldap \
-		&& myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
-		|| myconf="${myconf} --with-openldap=no"
-
-	use kerberos \
-		&& myconf="${myconf} --with-krb5=/usr" \
-		|| myconf="${myconf} --without-krb5"
-
-	myconf="${myconf} --with-kde-applnk-path=no"
-
-	# Use Mozilla's NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
-	# Use standalone NSS/NSPR if only 'ssl' in USE
-	# Openssl support doesn't work and has been disabled in cvs
-
-	if use ssl ; then
-		if  use mozilla ; then
-			NSS_LIB=/usr/lib/mozilla
-			NSS_INC=/usr/lib/mozilla/include
-		else
-			NSS_LIB=/usr/lib
-			NSS_INC=/usr/include
-		fi
-
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${NSS_INC}/nspr \
-			--with-nspr-libs=${NSS_LIB} \
-			--with-nss-includes=${NSS_INC}/nss \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
-		--without-nss-libs --without-nss-includes"
-	fi
-
-	gnome2_src_configure ${G2CONF} ${myconf}
-
-	# Needs to be able to connect to X display to build.
-	Xemake || Xmake || die "make failed"
-}
-
-pkg_postinst() {
-	gnome2_gconf_install ${GCONFFILEPATH}
-	einfo "To change the default browser if you are not using GNOME, do:"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-}
-
diff --git a/mail-client/evolution/evolution-1.5.93.ebuild b/mail-client/evolution/evolution-2.0.0.ebuild
index 6010287998fe..c372d62363e3 100644
--- a/mail-client/evolution/evolution-1.5.93.ebuild
+++ b/mail-client/evolution/evolution-2.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.5.93.ebuild,v 1.3 2004/08/28 01:30:10 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.0.ebuild,v 1.1 2004/09/17 13:58:53 foser Exp $
 
-inherit eutils virtualx gnome2 debug flag-o-matic
+inherit eutils virtualx gnome2 flag-o-matic
 
 # problems with -O3 on gcc-3.3.1
 replace-flags -O3 -O2
@@ -14,13 +14,12 @@ LICENSE="GPL-2"
 SLOT="2.0"
 KEYWORDS="~x86"
 IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda"
-RESTRICT="nomirror"
 
 # Top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.1.20
-	>=gnome-extra/gal-2.1.14
-	>=gnome-extra/evolution-data-server-0.0.98
-	>=net-libs/libsoup-2.1.13
+RDEPEND=">=gnome-extra/libgtkhtml-3.2.1
+	>=gnome-extra/gal-2.2.1
+	>=gnome-extra/evolution-data-server-1
+	>=net-libs/libsoup-2.2
 	>=dev-libs/glib-2
 	>=dev-libs/libxml2-2
 	>=gnome-base/gconf-2
@@ -35,13 +34,13 @@ RDEPEND=">=gnome-extra/libgtkhtml-3.1.20
 	>=x11-themes/gnome-icon-theme-1.2
 	>=gnome-base/orbit-2.9.8
 	pda? ( >=app-pda/gnome-pilot-2.0.10
-			>=app-pda/gnome-pilot-conduits-2.0.10 )
+		>=app-pda/gnome-pilot-conduits-2.0.10 )
 	spell? ( >=app-text/gnome-spell-1.0.5 )
 	crypt? ( >=app-crypt/gnupg-1.2.2 )
 	ssl? ( mozilla? ( net-www/mozilla )
-		   !mozilla? ( >=dev-libs/nspr-4.3
-						>=dev-libs/nss-3.8 ) )
-	ldap? ( >=net-nds/openldap-2.0 )
+		!mozilla? ( >=dev-libs/nspr-4.3
+			>=dev-libs/nss-3.8 ) )
+	ldap? ( >=net-nds/openldap-2 )
 	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )"
 
 DEPEND="${RDEPEND}
@@ -51,15 +50,15 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.30
 	sys-devel/gettext
 	sys-devel/bison
-	doc? ( dev-util/gtk-doc
-		>=app-text/scrollkeeper-0.3.10-r1 )"
+	>=app-text/scrollkeeper-0.3.10-r1
+	doc? ( dev-util/gtk-doc )"
 
 G2CONF="--disable-default-binary \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_enable ipv6) \
-		$(use_enable nntp) \
-		$(use_enable pda pilot-conduits)"
+	$(use_enable ssl nss) \
+	$(use_enable ssl smime) \
+	$(use_enable ipv6) \
+	$(use_enable nntp) \
+	$(use_enable pda pilot-conduits)"
 
 USE_DESTDIR="1"
 DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
@@ -124,11 +123,12 @@ src_compile() {
 }
 
 pkg_postinst() {
+
 	gnome2_gconf_install ${GCONFFILEPATH}
 	einfo "To change the default browser if you are not using GNOME, do:"
 	einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
 	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
 	einfo ""
 	einfo "Replace 'mozilla %s' with which ever browser you use."
-}
 
+}
diff --git a/mail-client/evolution/files/digest-evolution-1.4.5 b/mail-client/evolution/files/digest-evolution-1.4.5
deleted file mode 100644
index 9b6429c969e8..000000000000
--- a/mail-client/evolution/files/digest-evolution-1.4.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f16a86d6eaa9d9683f215586fcdac374 evolution-1.4.5.tar.bz2 13641682
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/mail-client/evolution/files/digest-evolution-1.5.92.1 b/mail-client/evolution/files/digest-evolution-1.5.92.1
deleted file mode 100644
index 387334a35d71..000000000000
--- a/mail-client/evolution/files/digest-evolution-1.5.92.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e83d43dbecc60d2ce88c961183b29e7 evolution-1.5.92.1.tar.bz2 12376932
diff --git a/mail-client/evolution/files/digest-evolution-1.5.93 b/mail-client/evolution/files/digest-evolution-1.5.93
deleted file mode 100644
index 9f02c7944db3..000000000000
--- a/mail-client/evolution/files/digest-evolution-1.5.93
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a01dc293bca189461f6cbd61b0a5a0ee evolution-1.5.93.tar.bz2 12839720
diff --git a/mail-client/evolution/files/digest-evolution-2.0.0 b/mail-client/evolution/files/digest-evolution-2.0.0
new file mode 100644
index 000000000000..ffe780b00df4
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.0.0
@@ -0,0 +1 @@
+MD5 9b36c4b99cd03bb4178569f90ac32022 evolution-2.0.0.tar.bz2 14985256
diff --git a/mail-client/evolution/files/evolution-1.4.5-gtk-2.4.patch b/mail-client/evolution/files/evolution-1.4.5-gtk-2.4.patch
deleted file mode 100644
index 034c466578a0..000000000000
--- a/mail-client/evolution/files/evolution-1.4.5-gtk-2.4.patch
+++ /dev/null
@@ -1,608 +0,0 @@
-diff -uNr evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.am evolution-1.4.5/addressbook/backend/ebook/Makefile.am
---- evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/backend/ebook/Makefile.am	2004-04-28 13:14:03.000000000 +0000
-@@ -45,8 +45,6 @@
- 	-I$(top_builddir)/addressbook/ename		\
- 	-I$(top_builddir)/shell				\
- 	-I$(top_srcdir)/shell				\
--	-DG_DISABLE_DEPRECATED				\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
-         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- privlib_LTLIBRARIES = libebook.la libebook-static.la
-diff -uNr evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.in evolution-1.4.5/addressbook/backend/ebook/Makefile.in
---- evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/backend/ebook/Makefile.in	2004-04-28 13:13:57.000000000 +0000
-@@ -263,8 +263,6 @@
- 	-I$(top_builddir)/addressbook/ename		\
- 	-I$(top_builddir)/shell				\
- 	-I$(top_srcdir)/shell				\
--	-DG_DISABLE_DEPRECATED				\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
-         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/backend/pas/Makefile.am evolution-1.4.5/addressbook/backend/pas/Makefile.am
---- evolution-1.4.5.orig/addressbook/backend/pas/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/backend/pas/Makefile.am	2004-04-28 13:14:10.000000000 +0000
-@@ -23,8 +23,6 @@
- 	-I$(top_srcdir) 				\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED				\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
-         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- LDAP_SCHEMA =						\
-diff -uNr evolution-1.4.5.orig/addressbook/backend/pas/Makefile.in evolution-1.4.5/addressbook/backend/pas/Makefile.in
---- evolution-1.4.5.orig/addressbook/backend/pas/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/backend/pas/Makefile.in	2004-04-28 13:14:15.000000000 +0000
-@@ -239,8 +239,6 @@
- 	-I$(top_srcdir) 				\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED				\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
-         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/gui/component/Makefile.am evolution-1.4.5/addressbook/gui/component/Makefile.am
---- evolution-1.4.5.orig/addressbook/gui/component/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/component/Makefile.am	2004-04-28 13:16:39.000000000 +0000
-@@ -21,10 +21,6 @@
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
- 	-DPREFIX=\""$(prefix)"\"				\
- 	$(LDAP_CFLAGS)						\
--	-DG_DISABLE_DEPRECATED					\
--	-DGTK_DISABLE_DEPRECATED				\
--	-DLIBGNOME_DISABLE_DEPRECATED				\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED				\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- component_LTLIBRARIES = libevolution-addressbook.la
-diff -uNr evolution-1.4.5.orig/addressbook/gui/component/Makefile.in evolution-1.4.5/addressbook/gui/component/Makefile.in
---- evolution-1.4.5.orig/addressbook/gui/component/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/component/Makefile.in	2004-04-28 13:16:44.000000000 +0000
-@@ -241,10 +241,6 @@
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
- 	-DPREFIX=\""$(prefix)"\"				\
- 	$(LDAP_CFLAGS)						\
--	-DG_DISABLE_DEPRECATED					\
--	-DGTK_DISABLE_DEPRECATED				\
--	-DLIBGNOME_DISABLE_DEPRECATED				\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED				\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.am evolution-1.4.5/addressbook/gui/component/select-names/Makefile.am
---- evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/component/select-names/Makefile.am	2004-04-28 13:16:22.000000000 +0000
-@@ -43,10 +43,6 @@
- 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
- 	-DPREFIX=\""$(prefix)"\"	\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- noinst_LTLIBRARIES = libeselectnames.la
-diff -uNr evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.in evolution-1.4.5/addressbook/gui/component/select-names/Makefile.in
---- evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/component/select-names/Makefile.in	2004-04-28 13:16:28.000000000 +0000
-@@ -258,10 +258,6 @@
- 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
- 	-DPREFIX=\""$(prefix)"\"	\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.am evolution-1.4.5/addressbook/gui/contact-editor/Makefile.am
---- evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/contact-editor/Makefile.am	2004-04-28 13:16:07.000000000 +0000
-@@ -12,10 +12,6 @@
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
- 	-DPREFIX=\""$(prefix)"\"			\
- 	-DG_LOG_DOMAIN=\"contact-editor\"		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- noinst_LTLIBRARIES =				\
-diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.in evolution-1.4.5/addressbook/gui/contact-editor/Makefile.in
---- evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/contact-editor/Makefile.in	2004-04-28 13:16:01.000000000 +0000
-@@ -232,10 +232,6 @@
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
- 	-DPREFIX=\""$(prefix)"\"			\
- 	-DG_LOG_DOMAIN=\"contact-editor\"		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.am evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.am
---- evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.am	2004-04-28 13:15:40.000000000 +0000
-@@ -13,10 +13,6 @@
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
- 	-DPREFIX=\""$(prefix)"\"			\
- 	-DG_LOG_DOMAIN=\"contact-list-editor\"		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- noinst_LTLIBRARIES =				\
-diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.in evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.in
---- evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.in	2004-04-28 13:15:34.000000000 +0000
-@@ -233,10 +233,6 @@
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
- 	-DPREFIX=\""$(prefix)"\"			\
- 	-DG_LOG_DOMAIN=\"contact-list-editor\"		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/gui/merging/Makefile.am evolution-1.4.5/addressbook/gui/merging/Makefile.am
---- evolution-1.4.5.orig/addressbook/gui/merging/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/merging/Makefile.am	2004-04-28 13:15:19.000000000 +0000
-@@ -4,10 +4,6 @@
- 	-I$(top_srcdir)					\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- noinst_LTLIBRARIES =				\
-diff -uNr evolution-1.4.5.orig/addressbook/gui/merging/Makefile.in evolution-1.4.5/addressbook/gui/merging/Makefile.in
---- evolution-1.4.5.orig/addressbook/gui/merging/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/merging/Makefile.in	2004-04-28 13:15:13.000000000 +0000
-@@ -224,10 +224,6 @@
- 	-I$(top_srcdir)					\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/gui/search/Makefile.am evolution-1.4.5/addressbook/gui/search/Makefile.am
---- evolution-1.4.5.orig/addressbook/gui/search/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/search/Makefile.am	2004-04-28 13:14:59.000000000 +0000
-@@ -13,10 +13,6 @@
- 	-I$(top_srcdir)/widgets/misc			\
- 	-I$(top_builddir)/shell				\
- 	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- noinst_LTLIBRARIES =				\
-diff -uNr evolution-1.4.5.orig/addressbook/gui/search/Makefile.in evolution-1.4.5/addressbook/gui/search/Makefile.in
---- evolution-1.4.5.orig/addressbook/gui/search/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/search/Makefile.in	2004-04-28 13:15:04.000000000 +0000
-@@ -233,10 +233,6 @@
- 	-I$(top_srcdir)/widgets/misc			\
- 	-I$(top_builddir)/shell				\
- 	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.am evolution-1.4.5/addressbook/gui/widgets/Makefile.am
---- evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/widgets/Makefile.am	2004-04-28 13:14:41.000000000 +0000
-@@ -11,10 +11,6 @@
- 	-I$(top_srcdir)/addressbook/gui/component	\
- 	-I$(top_srcdir)/widgets/misc			\
- 	-I$(top_builddir)/shell				\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- CORBA_COMPOSER_SOURCE_H	=			\
-diff -uNr evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.in evolution-1.4.5/addressbook/gui/widgets/Makefile.in
---- evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/widgets/Makefile.in	2004-04-28 13:14:48.000000000 +0000
-@@ -231,10 +231,6 @@
- 	-I$(top_srcdir)/addressbook/gui/component	\
- 	-I$(top_srcdir)/widgets/misc			\
- 	-I$(top_builddir)/shell				\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/tools/Makefile.am evolution-1.4.5/addressbook/tools/Makefile.am
---- evolution-1.4.5.orig/addressbook/tools/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/tools/Makefile.am	2004-04-28 13:13:21.000000000 +0000
-@@ -13,7 +13,6 @@
- 	-I$(top_srcdir)/addressbook			\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED	\
- 	$(GNOME_FULL_CFLAGS)
- 
- evolution_addressbook_export_SOURCES =				\
-diff -uNr evolution-1.4.5.orig/addressbook/tools/Makefile.in evolution-1.4.5/addressbook/tools/Makefile.in
---- evolution-1.4.5.orig/addressbook/tools/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/tools/Makefile.in	2004-04-28 13:13:25.000000000 +0000
-@@ -234,7 +234,6 @@
- 	-I$(top_srcdir)/addressbook			\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED	\
- 	$(GNOME_FULL_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/camel/Makefile.am evolution-1.4.5/camel/Makefile.am
---- evolution-1.4.5.orig/camel/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/Makefile.am	2004-04-28 13:12:56.000000000 +0000
-@@ -16,7 +16,6 @@
- 	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\"	\
- 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\
- 	-DG_LOG_DOMAIN=\"camel\"			\
--	-DG_DISABLE_DEPRECATED				\
- 	$(CAMEL_CFLAGS)
- 
- libcamel_la_SOURCES = 				\
-diff -uNr evolution-1.4.5.orig/camel/Makefile.in evolution-1.4.5/camel/Makefile.in
---- evolution-1.4.5.orig/camel/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/Makefile.in	2004-04-28 13:12:50.000000000 +0000
-@@ -235,7 +235,6 @@
- 	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\"	\
- 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\
- 	-DG_LOG_DOMAIN=\"camel\"			\
--	-DG_DISABLE_DEPRECATED				\
- 	$(CAMEL_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/camel/providers/imap/Makefile.am evolution-1.4.5/camel/providers/imap/Makefile.am
---- evolution-1.4.5.orig/camel/providers/imap/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/imap/Makefile.am	2004-04-28 13:11:20.000000000 +0000
-@@ -14,8 +14,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-imap-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-imap-provider\"
- 
- libcamelimap_la_SOURCES = 			\
- 	camel-imap-command.c			\
-diff -uNr evolution-1.4.5.orig/camel/providers/imap/Makefile.in evolution-1.4.5/camel/providers/imap/Makefile.in
---- evolution-1.4.5.orig/camel/providers/imap/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/imap/Makefile.in	2004-04-28 13:11:14.000000000 +0000
-@@ -233,8 +233,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-imap-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-imap-provider\"
- 
- 
- libcamelimap_la_SOURCES = \
-diff -uNr evolution-1.4.5.orig/camel/providers/local/Makefile.am evolution-1.4.5/camel/providers/local/Makefile.am
---- evolution-1.4.5.orig/camel/providers/local/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/local/Makefile.am	2004-04-28 13:10:32.000000000 +0000
-@@ -14,8 +14,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-local-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-local-provider\"	
- 
- libcamellocal_la_SOURCES = 			\
- 	camel-local-folder.c			\
-diff -uNr evolution-1.4.5.orig/camel/providers/local/Makefile.in evolution-1.4.5/camel/providers/local/Makefile.in
---- evolution-1.4.5.orig/camel/providers/local/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/local/Makefile.in	2004-04-28 13:10:40.000000000 +0000
-@@ -233,8 +233,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-local-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-local-provider\"
- 
- 
- libcamellocal_la_SOURCES = \
-diff -uNr evolution-1.4.5.orig/camel/providers/nntp/Makefile.am evolution-1.4.5/camel/providers/nntp/Makefile.am
---- evolution-1.4.5.orig/camel/providers/nntp/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/nntp/Makefile.am	2004-04-28 13:10:55.000000000 +0000
-@@ -13,8 +13,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-nntp-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-nntp-provider\"
- 
- libcamelnntp_la_SOURCES = 			\
- 	camel-nntp-provider.c			\
-diff -uNr evolution-1.4.5.orig/camel/providers/nntp/Makefile.in evolution-1.4.5/camel/providers/nntp/Makefile.in
---- evolution-1.4.5.orig/camel/providers/nntp/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/nntp/Makefile.in	2004-04-28 13:11:01.000000000 +0000
-@@ -232,8 +232,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-nntp-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-nntp-provider\"
- 
- 
- libcamelnntp_la_SOURCES = \
-diff -uNr evolution-1.4.5.orig/camel/providers/pop3/Makefile.am evolution-1.4.5/camel/providers/pop3/Makefile.am
---- evolution-1.4.5.orig/camel/providers/pop3/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/pop3/Makefile.am	2004-04-28 13:12:30.000000000 +0000
-@@ -15,8 +15,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-pop3-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-pop3-provider\"
- 
- libcamelpop3_la_SOURCES = 			\
- 	camel-pop3-engine.c			\
-diff -uNr evolution-1.4.5.orig/camel/providers/pop3/Makefile.in evolution-1.4.5/camel/providers/pop3/Makefile.in
---- evolution-1.4.5.orig/camel/providers/pop3/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/pop3/Makefile.in	2004-04-28 13:12:37.000000000 +0000
-@@ -234,8 +234,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-pop3-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-pop3-provider\"
- 
- 
- libcamelpop3_la_SOURCES = \
-diff -uNr evolution-1.4.5.orig/camel/providers/sendmail/Makefile.am evolution-1.4.5/camel/providers/sendmail/Makefile.am
---- evolution-1.4.5.orig/camel/providers/sendmail/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/sendmail/Makefile.am	2004-04-28 13:12:07.000000000 +0000
-@@ -14,8 +14,7 @@
- 	$(CAMEL_CFLAGS)					\
- 	$(GNOME_INCLUDEDIR)				\
- 	$(GTK_INCLUDEDIR) 				\
--	-DG_LOG_DOMAIN=\"camel-sendmail-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-sendmail-provider\"
- 
- libcamelsendmail_la_SOURCES = 			\
- 	camel-sendmail-provider.c		\
-diff -uNr evolution-1.4.5.orig/camel/providers/sendmail/Makefile.in evolution-1.4.5/camel/providers/sendmail/Makefile.in
---- evolution-1.4.5.orig/camel/providers/sendmail/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/sendmail/Makefile.in	2004-04-28 13:11:57.000000000 +0000
-@@ -233,8 +233,7 @@
- 	$(CAMEL_CFLAGS)					\
- 	$(GNOME_INCLUDEDIR)				\
- 	$(GTK_INCLUDEDIR) 				\
--	-DG_LOG_DOMAIN=\"camel-sendmail-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-sendmail-provider\"
- 
- 
- libcamelsendmail_la_SOURCES = \
-diff -uNr evolution-1.4.5.orig/camel/providers/smtp/Makefile.am evolution-1.4.5/camel/providers/smtp/Makefile.am
---- evolution-1.4.5.orig/camel/providers/smtp/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/smtp/Makefile.am	2004-04-28 13:11:44.000000000 +0000
-@@ -18,8 +18,7 @@
- 	$(NSPR_CFLAGS)				\
- 	$(NSS_CFLAGS)				\
- 	$(OPENSSL_CFLAGS)			\
--	-DG_LOG_DOMAIN=\"camel-smtp-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-smtp-provider\"
- 
- libcamelsmtp_la_SOURCES = 			\
- 	camel-smtp-provider.c			\
-diff -uNr evolution-1.4.5.orig/camel/providers/smtp/Makefile.in evolution-1.4.5/camel/providers/smtp/Makefile.in
---- evolution-1.4.5.orig/camel/providers/smtp/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/smtp/Makefile.in	2004-04-28 13:11:37.000000000 +0000
-@@ -237,8 +237,7 @@
- 	$(NSPR_CFLAGS)				\
- 	$(NSS_CFLAGS)				\
- 	$(OPENSSL_CFLAGS)			\
--	-DG_LOG_DOMAIN=\"camel-smtp-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-smtp-provider\"
- 
- 
- libcamelsmtp_la_SOURCES = \
-diff -uNr evolution-1.4.5.orig/composer/Makefile.am evolution-1.4.5/composer/Makefile.am
---- evolution-1.4.5.orig/composer/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/composer/Makefile.am	2004-04-28 13:10:08.000000000 +0000
-@@ -54,8 +54,6 @@
- 	-DEVOLUTION_GLADEDIR=\"$(gladedir)\"				\
- 	-DPREFIX=\"$(prefix)\"						\
- 	-DG_LOG_DOMAIN=\"composer\"					\
--	-DG_DISABLE_DEPRECATED						\
--	-DGTK_DISABLE_DEPRECATED					\
- 	$(EVOLUTION_MAIL_CFLAGS)
- 
- libcomposer_la_SOURCES = 			\
-diff -uNr evolution-1.4.5.orig/composer/Makefile.in evolution-1.4.5/composer/Makefile.in
---- evolution-1.4.5.orig/composer/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/composer/Makefile.in	2004-04-28 13:10:00.000000000 +0000
-@@ -266,8 +266,6 @@
- 	-DEVOLUTION_GLADEDIR=\"$(gladedir)\"				\
- 	-DPREFIX=\"$(prefix)\"						\
- 	-DG_LOG_DOMAIN=\"composer\"					\
--	-DG_DISABLE_DEPRECATED						\
--	-DGTK_DISABLE_DEPRECATED					\
- 	$(EVOLUTION_MAIL_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/e-util/Makefile.am evolution-1.4.5/e-util/Makefile.am
---- evolution-1.4.5.orig/e-util/Makefile.am	2004-04-28 12:35:54.000000000 +0000
-+++ evolution-1.4.5/e-util/Makefile.am	2004-04-28 13:09:47.000000000 +0000
-@@ -9,8 +9,6 @@
- 	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"				\
- 	-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\"	\
- 	-DG_LOG_DOMAIN=\"e-utils\"					\
--	-DG_DISABLE_DEPRECATED						\
--	-DGTK_DISABLE_DEPRECATED					\
- 	$(DB3_CFLAGS)							\
- 	$(GNOME_PILOT_CFLAGS)						\
- 	$(E_UTIL_CFLAGS)
-diff -uNr evolution-1.4.5.orig/e-util/Makefile.in evolution-1.4.5/e-util/Makefile.in
---- evolution-1.4.5.orig/e-util/Makefile.in	2004-04-28 12:35:54.000000000 +0000
-+++ evolution-1.4.5/e-util/Makefile.in	2004-04-28 13:09:42.000000000 +0000
-@@ -229,8 +229,6 @@
- 	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"				\
- 	-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\"	\
- 	-DG_LOG_DOMAIN=\"e-utils\"					\
--	-DG_DISABLE_DEPRECATED						\
--	-DGTK_DISABLE_DEPRECATED					\
- 	$(DB3_CFLAGS)							\
- 	$(GNOME_PILOT_CFLAGS)						\
- 	$(E_UTIL_CFLAGS)
-diff -uNr evolution-1.4.5.orig/filter/Makefile.am evolution-1.4.5/filter/Makefile.am
---- evolution-1.4.5.orig/filter/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/filter/Makefile.am	2004-04-28 13:09:28.000000000 +0000
-@@ -8,8 +8,6 @@
- 	-I $(top_srcdir)/shell			\
- 	-DFILTER_GLADEDIR=\"$(gladedir)\"	\
- 	-DG_LOG_DOMAIN=\"filter\"		\
--	-DG_DISABLE_DEPRECATED			\
--	-DGTK_DISABLE_DEPRECATED		\
- 	$(LIBFILTER_CFLAGS)
- 
- noinst_LTLIBRARIES =				\
-diff -uNr evolution-1.4.5.orig/filter/Makefile.in evolution-1.4.5/filter/Makefile.in
---- evolution-1.4.5.orig/filter/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/filter/Makefile.in	2004-04-28 13:09:23.000000000 +0000
-@@ -228,8 +228,6 @@
- 	-I $(top_srcdir)/shell			\
- 	-DFILTER_GLADEDIR=\"$(gladedir)\"	\
- 	-DG_LOG_DOMAIN=\"filter\"		\
--	-DG_DISABLE_DEPRECATED			\
--	-DGTK_DISABLE_DEPRECATED		\
- 	$(LIBFILTER_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/mail/Makefile.am evolution-1.4.5/mail/Makefile.am
---- evolution-1.4.5.orig/mail/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/mail/Makefile.am	2004-04-28 13:08:59.000000000 +0000
-@@ -34,8 +34,6 @@
- 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\"	\
- 	-DMAIL_IMPORTERSDIR=\""$(importerdir)"\"	\
- 	-DPREFIX=\""$(prefix)"\"			\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
- 	-DG_LOG_DOMAIN=\"evolution-mail\"
- 
- component_LTLIBRARIES = libevolution-mail.la
-diff -uNr evolution-1.4.5.orig/mail/Makefile.in evolution-1.4.5/mail/Makefile.in
---- evolution-1.4.5.orig/mail/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/mail/Makefile.in	2004-04-28 13:08:54.000000000 +0000
-@@ -254,8 +254,6 @@
- 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\"	\
- 	-DMAIL_IMPORTERSDIR=\""$(importerdir)"\"	\
- 	-DPREFIX=\""$(prefix)"\"			\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
- 	-DG_LOG_DOMAIN=\"evolution-mail\"
- 
- 
-diff -uNr evolution-1.4.5.orig/shell/Makefile.am evolution-1.4.5/shell/Makefile.am
---- evolution-1.4.5.orig/shell/Makefile.am	2004-04-28 12:35:54.000000000 +0000
-+++ evolution-1.4.5/shell/Makefile.am	2004-04-28 13:08:36.000000000 +0000
-@@ -1,8 +1,6 @@
- SUBDIRS = glade importer
- 
- INCLUDES =							\
--	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED		\
--	-DBONOBO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED	\
- 	-I$(top_srcdir)/widgets					\
- 	-I$(top_srcdir)/widgets/misc				\
- 	-I$(top_srcdir)/libical/src/libical			\
-diff -uNr evolution-1.4.5.orig/shell/Makefile.in evolution-1.4.5/shell/Makefile.in
---- evolution-1.4.5.orig/shell/Makefile.in	2004-04-28 12:35:54.000000000 +0000
-+++ evolution-1.4.5/shell/Makefile.in	2004-04-28 13:08:32.000000000 +0000
-@@ -221,8 +221,6 @@
- SUBDIRS = glade importer
- 
- INCLUDES = \
--	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED		\
--	-DBONOBO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED	\
- 	-I$(top_srcdir)/widgets					\
- 	-I$(top_srcdir)/widgets/misc				\
- 	-I$(top_srcdir)/libical/src/libical			\
-diff -uNr evolution-1.4.5.orig/tools/Makefile.am evolution-1.4.5/tools/Makefile.am
---- evolution-1.4.5.orig/tools/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/tools/Makefile.am	2004-04-28 13:08:11.000000000 +0000
-@@ -21,7 +21,6 @@
- 	-I$(top_srcdir)/addressbook			\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED	\
- 	$(GNOME_FULL_CFLAGS)
- 
- EXTRA_DIST = $(privlibexec_SCRIPTS) verify-evolution-install.sh \
-diff -uNr evolution-1.4.5.orig/tools/Makefile.in evolution-1.4.5/tools/Makefile.in
---- evolution-1.4.5.orig/tools/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/tools/Makefile.in	2004-04-28 13:08:17.000000000 +0000
-@@ -242,7 +242,6 @@
- 	-I$(top_srcdir)/addressbook			\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED	\
- 	$(GNOME_FULL_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/widgets/misc/Makefile.am evolution-1.4.5/widgets/misc/Makefile.am
---- evolution-1.4.5.orig/widgets/misc/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/widgets/misc/Makefile.am	2004-04-28 13:07:48.000000000 +0000
-@@ -6,7 +6,6 @@
- 	-I$(top_srcdir)/widgets/shortcut-bar				\
- 	-DMAP_DIR=\""$(imagesdir)"\"					\
- 	-DG_LOG_DOMAIN=__FILE__						\
--	-DG_DISABLE_DEPRECATED						\
- 	$(GNOME_FULL_CFLAGS)
- 
- privlib_LTLIBRARIES =	\
-diff -uNr evolution-1.4.5.orig/widgets/misc/Makefile.in evolution-1.4.5/widgets/misc/Makefile.in
---- evolution-1.4.5.orig/widgets/misc/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/widgets/misc/Makefile.in	2004-04-28 13:07:58.000000000 +0000
-@@ -227,7 +227,6 @@
- 	-I$(top_srcdir)/widgets/shortcut-bar				\
- 	-DMAP_DIR=\""$(imagesdir)"\"					\
- 	-DG_LOG_DOMAIN=__FILE__						\
--	-DG_DISABLE_DEPRECATED						\
- 	$(GNOME_FULL_CFLAGS)
- 
- 
diff --git a/mail-client/evolution/files/evolution-1.4.5-nztimezone.patch b/mail-client/evolution/files/evolution-1.4.5-nztimezone.patch
deleted file mode 100644
index 452f746ea3bc..000000000000
--- a/mail-client/evolution/files/evolution-1.4.5-nztimezone.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: camel-mime-utils.c
-===================================================================
-RCS file: /cvs/gnome/evolution/camel/camel-mime-utils.c,v
-retrieving revision 1.183.4.4
-diff -u -r1.183.4.4 camel-mime-utils.c
---- camel-mime-utils.c	26 Sep 2003 16:04:49 -0000	1.183.4.4
-+++ camel-mime-utils.c	8 Oct 2003 16:40:41 -0000
-@@ -3530,12 +3530,12 @@
- 		offset = (*inptr++)=='-'?-1:1;
- 		offset = offset * header_decode_int(&inptr);
- 		d(printf("abs signed offset = %d\n", offset));
--		if (offset < -1200 || offset > 1200)
-+		if (offset < -1200 || offset > 1400)
- 			offset = 0;
- 	} else if (isdigit(*inptr)) {
- 		offset = header_decode_int(&inptr);
- 		d(printf("abs offset = %d\n", offset));
--		if (offset < -1200 || offset > 1200)
-+		if (offset < -1200 || offset > 1400)
- 			offset = 0;
- 	} else {
- 		char *tz = decode_token(&inptr);
-Index: camel-text-index.c
-===================================================================
-RCS file: /cvs/gnome/evolution/camel/camel-text-index.c,v
-retrieving revision 1.16
-diff -u -r1.16 camel-text-index.c
---- camel-text-index.c	11 Jun 2003 19:38:33 -0000	1.16
-+++ camel-text-index.c	8 Oct 2003 16:40:44 -0000
-@@ -55,6 +55,8 @@
- /* cursor debug */
- #define c(x)
- 
-+#define CAMEL_TEXT_INDEX_MAX_WORDLEN  (60)
-+
- #ifdef ENABLE_THREADS
- #define CAMEL_TEXT_INDEX_LOCK(kf, lock) (e_mutex_lock(((CamelTextIndex *)kf)->priv->lock))
- #define CAMEL_TEXT_INDEX_UNLOCK(kf, lock) (e_mutex_unlock(((CamelTextIndex *)kf)->priv->lock))
-@@ -1478,11 +1480,12 @@
- 			utf8[utf8len] = 0;
- 			g_string_append(p->buffer, utf8);
- 		} else {
--			if (p->buffer->len) {
-+			if (p->buffer->len < CAMEL_TEXT_INDEX_MAX_WORDLEN) {
- 				text_index_name_add_word(idn, p->buffer->str);
- 				/*camel_index_name_add_word(idn, p->buffer->str);*/
--				g_string_truncate(p->buffer, 0);
- 			}
-+			
-+			g_string_truncate (p->buffer, 0);
- 		}
- 	}
-