add gtk-2.4 patch to 1.4.5, mark 1.4.6 x86

12 files changed, 619 insertions, 735 deletions

diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog
index d3d1a2dcac91..8ffb3088e5cc 100644
--- a/net-mail/evolution/ChangeLog
+++ b/net-mail/evolution/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/evolution
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.96 2004/04/27 20:53:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.97 2004/04/28 13:10:29 foser Exp $
+
+  28 Apr 2004; foser <foser@gentoo.org> evolution-1.4.5.ebuild :
+  Add gtk-2.4 build patch, provided by gmsoft in #49265
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> evolution-1.4.5.ebuild,
   evolution-1.4.6.ebuild:
diff --git a/net-mail/evolution/evolution-1.2.3.ebuild b/net-mail/evolution/evolution-1.2.3.ebuild
deleted file mode 100644
index 1224db6fda2f..000000000000
--- a/net-mail/evolution/evolution-1.2.3.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.2.3.ebuild,v 1.10 2004/03/25 08:24:36 mr_bones_ Exp $
-
-IUSE="ssl nls mozilla ldap doc spell pda ipv6 crypt"
-
-#provide Xmake and Xemake
-
-inherit eutils flag-o-matic gnome.org libtool virtualx
-
-DB3="db-3.1.17"
-S="${WORKDIR}/${P}"
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="ftp://ftp.ximian.com/pub/ximian-evolution/source/${P}.tar.gz
-	http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc"
-
-RDEPEND="app-text/scrollkeeper
-	>=gnome-extra/bonobo-conf-0.16
-	>=gnome-base/bonobo-1.0.21
-	>=gnome-base/gnome-common-1.2
-	=gnome-extra/gal-0.24*
-	=gnome-base/gconf-1.0*
-	>=gnome-extra/gtkhtml-1.1.8
-	>=gnome-base/oaf-0.6.10
-	>=gnome-base/ORBit-0.5.12
-	<gnome-base/libglade-2.0
-	>=media-libs/gdk-pixbuf-0.18.0
-	>=dev-libs/libxml-1.8.17
-	=gnome-base/gnome-vfs-1.0*
-	>=gnome-base/gnome-print-0.35
-	=dev-util/gob-1*
-	>=net-libs/soup-0.7.10
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	doc?	 ( >=app-text/scrollkeeper-0.3.10-r1 )
-	ssl? (
-		mozilla? ( >=net-www/mozilla-0.9.9 )
-		!mozilla? ( >=dev-libs/openssl-0.9.5 ) )
-	ldap?    ( >=net-nds/openldap-2.0 )
-	pda?     ( =app-pda/gnome-pilot-0.1*
-			>=app-pda/pilot-link-0.11.5 )
-	spell?   ( <app-text/gnome-spell-1.0 )"
-
-# the pilot-link dep is normally covered by gnome-pilot, but evo
-# requires an higher version then gnome-pilot (bug #10307)
-
-# Added dependency on "dev-util/gob" this should fix a configure bug
-
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-1.4.1-r1
-	doc? ( dev-util/gtk-doc )
-	nls?  ( >=dev-util/intltool-0.20
-	        sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S};
-	# Mandrake patches
-	epatch ${FILESDIR}/${PN}-1.1.90-kde.patch
-	epatch ${FILESDIR}/${PN}-1.1.90-subversion.patch
-	epatch ${FILESDIR}/${PN}-1.1.90-sharedldap.patch
-
-	# libtoolize to fix not all libs installing, and buggy .la files.
-	# also add the gnome-pilot.m4 to the macros directory to fix
-	# problems with the pilot conduct
-	cd ${S}; cp -f ltmain.sh ${S}/libical/
-	elibtoolize --reverse-deps
-	aclocal -I macros -I /usr/share/aclocal/gnome-macros
-	autoconf
-	automake --add-missing
-
-	(cd libical ; aclocal -I /usr/share/aclocal/gnome-macros ; autoconf)
-
-	# Fix sandbox errors
-	cd ${S}/default_user
-	cp Makefile.in Makefile.in.orig
-	sed -e 's:-mkdir $(defaultdir:-mkdir $(DESTDIR)$(defaultdir:g' \
-		Makefile.in.orig > Makefile.in
-}
-
-src_compile() {
-
-	# *************************************************************
-	#
-	#   DB3 compile...
-	#
-	# *************************************************************
-
-	# Rather ugly hack to make sure pthread mutex support are not enabled ...
-	cd ${WORKDIR}/${DB3}/dist
-#	cp configure configure.orig
-#	awk '!/MUTEX.*THREADS/ { sub("mut_pthread", "mut_fcntl"); print }' \
-#		configure.orig > configure
-
-	einfo "Compiling DB3..."
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-
-	if [ "`egrep "^LIBS=[[:space:]]*-lpthread" Makefile`" ]
-	then
-		append-flags "-pthread"
-	fi
-
-	make || die
-	make prefix=${WORKDIR}/db3 install || die
-
-	# *************************************************************
-	#
-	#   Evolution compile...
-	#
-	# *************************************************************
-
-	einfo "Compiling Evolution..."
-	cd ${S}
-
-	local myconf=""
-	local MOZILLA="${MOZILLA_FIVE_HOME}"
-
-	if [ -n "`use pda`" ] ; then
-		myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes"
-	else
-		myconf="${myconf} --enable-pilot-conduits=no"
-	fi
-
-	if [ -n "`use ldap`" ] ; then
-		myconf="${myconf} --with-openldap=yes --with-static-ldap=no"
-	else
-		myconf="${myconf} --with-openldap=no"
-	fi
-
-	# Use Mozilla NSS libs if 'mozilla' *and* 'ssl' in USE
-	if [ -n "`use ssl`" -a -n "`use mozilla`" ] ; then
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${MOZILLA}/include/nspr \
-			--with-nspr-libs=${MOZILLA} \
-			--with-nss-includes=${MOZILLA}/include/nss \
-			--with-nss-libs=${MOZILLA}"
-	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 [ -n "`use ssl`" -a -z "`use mozilla`" ] ; then
-		myconf="${myconf} --enable-openssl=yes"
-	fi
-
-	if [ -n "`use doc`" ] ; then
-		myconf="${myconf} --enable-gtk-doc"
-	else
-		myconf="${myconf} --disable-gtk-doc"
-	fi
-
-	if [ -n "`use ipv6`" ] ; then
-		myconf="${myconf} --enable-ipv6=yes"
-	else
-		myconf="${myconf} --enable-ipv6=no"
-	fi
-
-	if [ -z "`use nls`" ] ; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	CFLAGS="${CFLAGS} -I/usr/include/libpisock"
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--with-db3=${WORKDIR}/db3 \
-		--disable-python-bindings \
-		${myconf} || die
-
-	#needs to be able to connect to X display to build.
-	Xemake || Xmake || die
-}
-
-src_install() {
-	cd omf-install
-	cp Makefile Makefile.old
-	sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
-	rm Makefile.old
-	cd ${S}
-
-	# Install with $DESTDIR, as in some rare cases $D gets hardcoded
-	# into the binaries (seems like a ccache problem at present),
-	# because everything is recompiled with the "new" PREFIX, if
-	# $DESTDIR is _not_ used.
-	make DESTDIR=${D} \
-		prefix=/usr \
-		mandir=/usr/share/man \
-		infodir=/usr/share/info \
-		datadir=/usr/share \
-		sysconfdir=/etc \
-		localstatedir=/var/lib \
-		KDE_APPLNK_DIR=/usr/share/applnk \
-		install || die
-
-	dodoc AUTHORS COPYING* ChangeLog HACKING MAINTAINERS
-	dodoc NEWS README
-}
-
-pkg_postinst() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
-pkg_postrm() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
diff --git a/net-mail/evolution/evolution-1.2.4.ebuild b/net-mail/evolution/evolution-1.2.4.ebuild
deleted file mode 100644
index fc31711fb637..000000000000
--- a/net-mail/evolution/evolution-1.2.4.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.2.4.ebuild,v 1.17 2004/03/25 08:24:36 mr_bones_ Exp $
-
-IUSE="ssl nls mozilla ldap doc spell pda ipv6 kerberos kde crypt"
-
-#provide Xmake and Xemake
-
-inherit eutils flag-o-matic gnome.org libtool virtualx
-
-DB3="db-3.1.17"
-S="${WORKDIR}/${P}"
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="ftp://ftp.ximian.com/pub/ximian-evolution/source/${P}.tar.gz
-	http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc hppa"
-
-RDEPEND="app-text/scrollkeeper
-	>=gnome-extra/bonobo-conf-0.16
-	>=gnome-base/bonobo-1.0.21
-	>=gnome-base/gnome-common-1.2
-	=gnome-extra/gal-0.24*
-	=gnome-base/gconf-1.0*
-	>=gnome-extra/gtkhtml-1.1.10
-	>=gnome-base/oaf-0.6.10
-	>=gnome-base/ORBit-0.5.12
-	<gnome-base/libglade-2.0
-	>=media-libs/gdk-pixbuf-0.18.0
-	>=dev-libs/libxml-1.8.17
-	=gnome-base/gnome-vfs-1.0*
-	>=gnome-base/gnome-print-0.35
-	=dev-util/gob-1*
-	>=net-libs/soup-0.7.11
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	doc?	 ( >=app-text/scrollkeeper-0.3.10-r1 )
-	ssl? (
-		mozilla? ( >=net-www/mozilla-0.9.9 )
-		!mozilla? ( >=dev-libs/openssl-0.9.5 ) )
-	ldap?    ( >=net-nds/openldap-2.0 )
-	pda?     ( =app-pda/gnome-pilot-0.1*
-			>=app-pda/pilot-link-0.11.5 )
-	spell?   ( <app-text/gnome-spell-1.0 )
-	kerberos? ( app-crypt/mit-krb5 )"
-
-# the pilot-link dep is normally covered by gnome-pilot, but evo
-# requires an higher version then gnome-pilot (bug #10307)
-
-# Added dependency on "dev-util/gob" this should fix a configure bug
-
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-1.4.1-r1
-	>=sys-apps/sed-4
-	doc? ( dev-util/gtk-doc )
-	nls?  ( >=dev-util/intltool-0.20
-	        sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S};
-	# Mandrake patches
-	epatch ${FILESDIR}/${PN}-1.1.90-kde.patch
-	epatch ${FILESDIR}/${PN}-1.1.90-subversion.patch
-	epatch ${FILESDIR}/${PN}-1.1.90-sharedldap.patch
-
-	# libtoolize to fix not all libs installing, and buggy .la files.
-	# also add the gnome-pilot.m4 to the macros directory to fix
-	# problems with the pilot conduct
-	cd ${S}; cp -f ltmain.sh ${S}/libical/
-	elibtoolize --reverse-deps
-	aclocal -I macros -I /usr/share/aclocal/gnome-macros
-	autoconf
-	automake --add-missing
-
-	(cd libical ; aclocal -I /usr/share/aclocal/gnome-macros ; autoconf)
-
-	# Fix sandbox errors
-	cd ${S}/default_user
-	cp Makefile.in Makefile.in.orig
-	sed -e 's:-mkdir $(defaultdir:-mkdir $(DESTDIR)$(defaultdir:g' \
-		Makefile.in.orig > Makefile.in
-
-	# Remove unneeded db1 linking for nss/mozilla
-	cd ${S}; sed -i -e "s/-ldb1//" configure.in
-}
-
-src_compile() {
-
-	# *************************************************************
-	#
-	#   DB3 compile...
-	#
-	# *************************************************************
-
-	# Rather ugly hack to make sure pthread mutex support are not enabled ...
-	cd ${WORKDIR}/${DB3}/dist
-#	cp configure configure.orig
-#	awk '!/MUTEX.*THREADS/ { sub("mut_pthread", "mut_fcntl"); print }' \
-#		configure.orig > configure
-
-	einfo "Compiling DB3..."
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-
-	if [ "`egrep "^LIBS=[[:space:]]*-lpthread" Makefile`" ]
-	then
-		append-flags "-pthread"
-	fi
-
-	make || die
-	make prefix=${WORKDIR}/db3 install || die
-
-	# *************************************************************
-	#
-	#   Evolution compile...
-	#
-	# *************************************************************
-
-	einfo "Compiling Evolution..."
-	cd ${S}
-
-	local myconf=""
-	local MOZILLA="${MOZILLA_FIVE_HOME}"
-
-	if [ -n "`use pda`" ] ; then
-		myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes"
-	else
-		myconf="${myconf} --enable-pilot-conduits=no"
-	fi
-
-	if [ -n "`use ldap`" ] ; then
-		myconf="${myconf} --with-openldap=yes --with-static-ldap=no"
-	else
-		myconf="${myconf} --with-openldap=no"
-	fi
-
-	if [ -n "`use kerberos`" ]; then
-		myconf="${myconf} --with-krb5=/usr --with-krb4=/usr"
-	else
-		myconf="${myconf} --with-krb5=no --with-krb4=no"
-	fi
-
-	# Use Mozilla NSS libs if 'mozilla' *and* 'ssl' in USE
-	if [ -n "`use ssl`" -a -n "`use mozilla`" ] ; then
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${MOZILLA}/include/nspr \
-			--with-nspr-libs=${MOZILLA} \
-			--with-nss-includes=${MOZILLA}/include/nss \
-			--with-nss-libs=${MOZILLA}"
-	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 [ -n "`use ssl`" -a -z "`use mozilla`" ] ; then
-		myconf="${myconf} --enable-openssl=yes"
-	fi
-
-	if [ -n "`use doc`" ] ; then
-		myconf="${myconf} --enable-gtk-doc"
-	else
-		myconf="${myconf} --disable-gtk-doc"
-	fi
-
-	if [ -n "`use ipv6`" ] ; then
-		myconf="${myconf} --enable-ipv6=yes"
-	else
-		myconf="${myconf} --enable-ipv6=no"
-	fi
-
-	if [ -z "`use nls`" ] ; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	CFLAGS="${CFLAGS} -I/usr/include/libpisock"
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--with-db3=${WORKDIR}/db3 \
-		--disable-python-bindings \
-		${myconf} || die
-
-	# fix xml-i18n-merge UTF-8 problems
-	export LANG="C"
-
-	#needs to be able to connect to X display to build.
-	Xemake || Xmake || die
-}
-
-src_install() {
-	cd omf-install
-	cp Makefile Makefile.old
-	sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
-	rm Makefile.old
-	cd ${S}
-
-	# Install with $DESTDIR, as in some rare cases $D gets hardcoded
-	# into the binaries (seems like a ccache problem at present),
-	# because everything is recompiled with the "new" PREFIX, if
-	# $DESTDIR is _not_ used.
-	make DESTDIR=${D} \
-		prefix=/usr \
-		mandir=/usr/share/man \
-		infodir=/usr/share/info \
-		datadir=/usr/share \
-		sysconfdir=/etc \
-		localstatedir=/var/lib \
-		KDE_APPLNK_DIR=/usr/share/applnk \
-		install || die
-
-	# remove kde link if USE="-kde"
-	if [ -z "`use kde`" ]; then
-		rm -rf ${D}/usr/share/applnk
-	fi
-
-	dodoc AUTHORS COPYING* ChangeLog HACKING MAINTAINERS
-	dodoc NEWS README
-}
-
-pkg_postinst() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
-pkg_postrm() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
diff --git a/net-mail/evolution/evolution-1.4.5.ebuild b/net-mail/evolution/evolution-1.4.5.ebuild
index 342f7cfb9692..d2f9a4b98b1c 100644
--- a/net-mail/evolution/evolution-1.4.5.ebuild
+++ b/net-mail/evolution/evolution-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.5.ebuild,v 1.17 2004/04/27 20:53:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.5.ebuild,v 1.18 2004/04/28 13:10:29 foser Exp $
 
 # kde before gnome2, otherwise kde_src_install will override gnome2_src_install
 use kde && inherit kde
@@ -86,6 +86,10 @@ src_unpack() {
 	# 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 #####
diff --git a/net-mail/evolution/evolution-1.4.6.ebuild b/net-mail/evolution/evolution-1.4.6.ebuild
index 8be0848ba7de..a60ef55356a3 100644
--- a/net-mail/evolution/evolution-1.4.6.ebuild
+++ b/net-mail/evolution/evolution-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.6.ebuild,v 1.4 2004/04/27 20:53:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.6.ebuild,v 1.5 2004/04/28 13:10:29 foser Exp $
 
 # kde before gnome2, otherwise kde_src_install will override gnome2_src_install
 use kde && inherit kde
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~alpha ~amd64"
 
 # Top stanza are ximian deps
 RDEPEND=">=gnome-extra/libgtkhtml-3.0.10
diff --git a/net-mail/evolution/files/digest-evolution-1.2.3 b/net-mail/evolution/files/digest-evolution-1.2.3
deleted file mode 100644
index eb278bee7261..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.2.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 58612569e900c2c97d3f0e6515517058 evolution-1.2.3.tar.gz 16331377
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.2.4 b/net-mail/evolution/files/digest-evolution-1.2.4
deleted file mode 100644
index b3cec260c9c4..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.2.4
+++ /dev/null
@@ -1,16 +0,0 @@
-MD5 dc3bc6e2c133bb380f48f50f4918052e /files/evolution-1.0.2-conduit.patch 308
-MD5 76b7ec4d297cc9e14fd0c348c8449b75 /files/evolution-1.0.2-imapfix.diff 2838
-MD5 53050cb008a2555b215f7401772cfede /files/evolution-1.0.2-kde.patch 656
-MD5 d6c7be2ddd045fb5d487416bd09f1c1b /files/evolution-1.0.3-filter-crash.patch 1202
-MD5 1a2892e6ac519f18f30f5e2aa6508174 /files/evolution-1.0.8-mark-read-crash.patch 2018
-MD5 ecec58337e9c9f9ffb1013c4860fd33c /files/evolution-1.0.8-scrollkeeper.patch 1492
-MD5 c837abd50d990dea46fcea32b8a1b001 /files/evolution-1.1.90-kde.patch 689
-MD5 d2dcad91e6ec97286468eb7d13ceac9b /files/evolution-1.1.90-scrollkeeper.patch 1365
-MD5 8909b7f2d3483d55036f21ca2780e4a3 /files/evolution-1.1.90-sharedldap.patch 370
-MD5 f44bc5e363c1f976a7a72676886b9d13 /files/evolution-1.1.90-subversion.patch 470
-MD5 63d02821e6de8e0129d954d406dc77ae /files/evolution-1.1.90-utf8.patch 726
-MD5 2526fb78fe27dc17b78566860285bff1 /files/evolution-1.2.0-settingscrash.patch 625
-MD5 980771bb5349699c8d8ecd6b6f035b50 /files/gnome-pilot.m4 6452
-MD5 eb3c88124e9daf30ee0f70e4e10ea53d /evolution-1.2.4.ebuild 6239
-MD5 2c525e0d0e570c96e4fb1fd95e46354c evolution-1.2.4.tar.gz 16673251
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/evolution-1.1.90-kde.patch b/net-mail/evolution/files/evolution-1.1.90-kde.patch
deleted file mode 100644
index af178f1210f5..000000000000
--- a/net-mail/evolution/files/evolution-1.1.90-kde.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- evolution-1.1.90/configure.in.kde	2002-11-07 13:07:41.000000000 +0100
-+++ evolution-1.1.90/configure.in	2002-11-07 13:12:12.000000000 +0100
-@@ -1196,18 +1196,8 @@
- 	if test -z "$with_kde_applnk_path"; then
- 		with_kde_applnk_path="$prefix/share/applnk"
- 	fi
--	if test -d "$with_kde_applnk_path" ; then
--		AC_DEFINE(HAVE_KDE_APPLNK)
--		KDE_APPLNK_DIR="$with_kde_applnk_path"
--	else
--		AC_PATH_PROG(KDECONFIG, kde-config)
--		if test -n "$KDECONFIG"; then
--			KDE_APPLNK_DIR=`$KDECONFIG --expandvars --install apps`
--			AC_DEFINE(HAVE_KDE_APPLNK)
--		else
--			KDE_APPLNK_DIR=""
--		fi
--	fi
-+	AC_DEFINE(HAVE_KDE_APPLNK)
-+	KDE_APPLNK_DIR="$with_kde_applnk_path"
- else
- 	KDE_APPLNK_DIR=""
- fi
diff --git a/net-mail/evolution/files/evolution-1.1.90-sharedldap.patch b/net-mail/evolution/files/evolution-1.1.90-sharedldap.patch
deleted file mode 100644
index 6784aa343848..000000000000
--- a/net-mail/evolution/files/evolution-1.1.90-sharedldap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- evolution-1.1.90/acinclude.m4.orig	2002-09-04 22:28:05.000000000 +0200
-+++ evolution-1.1.90/acinclude.m4	2002-11-07 14:03:12.000000000 +0100
-@@ -107,7 +107,7 @@
- 
- 		case $with_static_ldap in
- 		no|"")
--			if test -f $with_openldap/lib/libldap.la; then
-+			if test ! -f $with_openldap/lib/libldap.la; then
- 				with_static_ldap=yes
- 			else
- 				with_static_ldap=no
diff --git a/net-mail/evolution/files/evolution-1.1.90-subversion.patch b/net-mail/evolution/files/evolution-1.1.90-subversion.patch
deleted file mode 100644
index 83cb40fd71b0..000000000000
--- a/net-mail/evolution/files/evolution-1.1.90-subversion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- evolution-1.1.90/mail/mail-ops.c.subversion	2002-09-24 19:45:37.000000000 +0200
-+++ evolution-1.1.90/mail/mail-ops.c	2002-11-07 13:17:20.000000000 +0100
-@@ -467,7 +467,7 @@
- 	int i;
- 	
- 	camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer",
--				 "Ximian Evolution " VERSION SUB_VERSION " " VERSION_COMMENT);
-+				 "Ximian Evolution " VERSION "-" SUB_VERSION " " VERSION_COMMENT);
- 	
- 	camel_mime_message_set_date (message, CAMEL_MESSAGE_DATE_CURRENT, 0);
- 	
diff --git a/net-mail/evolution/files/evolution-1.4.5-gtk-2.4.patch b/net-mail/evolution/files/evolution-1.4.5-gtk-2.4.patch
new file mode 100644
index 000000000000..034c466578a0
--- /dev/null
+++ b/net-mail/evolution/files/evolution-1.4.5-gtk-2.4.patch
@@ -0,0 +1,608 @@
+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/net-mail/evolution/files/gnome-pilot.m4 b/net-mail/evolution/files/gnome-pilot.m4
deleted file mode 100644
index d8ce9606ae14..000000000000
--- a/net-mail/evolution/files/gnome-pilot.m4
+++ /dev/null
@@ -1,213 +0,0 @@
-dnl
-dnl GNOME_PILOT_HOOK(script if found, fail)
-dnl if fail = "failure", abort if gnome-pilot not found
-dnl
-
-dnl
-dnl 
-
-GNOME_PILOT_CFLAGS=
-GNOME_PILOT_LIBS=
-PISOCK_CFLAGS=
-PISOCK_LIBS=
-
-AC_SUBST(GNOME_PILOT_CFLAGS)
-AC_SUBST(GNOME_PILOT_LIBS)
-AC_SUBST(PISOCK_CFLAGS)
-AC_SUBST(PISOCK_LIBS)
-
-AC_DEFUN([PILOT_LINK_HOOK],[
-	AC_ARG_WITH(pisock,
-	[  --with-pisock            Specify prefix for pisock files],[
-	if test x$withval = xyes; then
-	    dnl Note that an empty true branch is not valid sh syntax.
-	    ifelse([$1], [], :, [$1])
-	else
-	    PISOCK_CFLAGS="-I$withval/include"
-	    incdir="$withval/include"
-	    PISOCK_LIBS="-L$withval/lib -lpisock"
-	    AC_MSG_CHECKING("for existance of $withval/lib/libpisock.so")
-	    if test -r $withval/lib/libpisock.so; then
-		AC_MSG_RESULT("yes")
-	    else
-		AC_MSG_ERROR("Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/.")
-	    fi
-	fi
-	])
-
-	if test x$PISOCK_CFLAGS = x; then
-	    AC_CHECK_HEADER(pi-version.h, [incdir="/usr/include"], [
-	    AC_CHECK_HEADER(libpisock/pi-version.h, [PISOCK_CFLAGS="-I/usr/include/libpisock"
-	                                             piversion_include="libpisock/pi-version.h"
-						     incdir="/usr/include/libpisock"
-                                                    ], [
-	    AC_CHECK_HEADER($prefix/include/pi-version.h, [PISOCK_CFLAGS="-I$prefix/include/libpisock"
-	                                                   piversion_include="$prefix/include/pi-version.h"
-						           if test x$PISOCK_LIBDIR = x; then
-							      incdir="$prefix/include"
-							      PISOCK_LIBS="-L$prefix/lib -lpisock"
-                                                           fi							  ],
-	    AC_MSG_ERROR("Unable to find pi-version.h")) 
-	    ])
-	    ])
-	fi
-		
-	if test "x$PISOCK_LIBS" = "x"; then
-		AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS=-lpisock ], 
-			[ AC_MSG_ERROR("Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/.") ])
-	fi
-	
-	AC_ARG_ENABLE(pilotlinktest,
-		[  --enable-pilotlinktest   Test for correct version of pilot-link],
-		[testplversion=$enableval],
-		[ testplversion=yes ]
-	)
-
-	if test x$piversion_include = x; then
-		piversion_include="pi-version.h"
-	fi
-
-	pi_version=`cat $incdir/pi-version.h|grep PILOT_LINK_VERSION|sed 's/#define PILOT_LINK_VERSION \([[0-9]]*\)/\1/'`
-	pi_major=`cat $incdir/pi-version.h|grep PILOT_LINK_MAJOR|sed 's/#define PILOT_LINK_MAJOR \([[0-9]]*\)/\1/'`
-	pi_minor=`cat $incdir/pi-version.h|grep PILOT_LINK_MINOR|sed 's/#define PILOT_LINK_MINOR \([[0-9]]*\)/\1/'`
-	pi_patch=`cat $incdir/pi-version.h|grep PILOT_LINK_PATCH|sed 's/#define PILOT_LINK_PATCH \"\(.*\)\"/\1/'`
-
-	PILOT_LINK_VERSION="$pi_version.$pi_major.$pi_minor$pi_patch"
-
-	if test x$testplversion = xyes; then
-		AC_MSG_CHECKING(for pilot-link version >= $1)
-		pl_ve=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-		pl_ma=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-		pl_mi=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-		CFLAGS_save="$CFLAGS"
-		CFLAGS="$CFLAGS $PISOCK_CFLAGS"
-		AC_TRY_RUN(
-			[
-			#include <$piversion_include>
-			int main(int argc,char *argv[]) {
-				if (PILOT_LINK_VERSION == $pl_ve) {
-					if (PILOT_LINK_MAJOR == $pl_ma) {
-						if (PILOT_LINK_MINOR >= $pl_mi) {
-							return 0;
-				       	  	}
-					} else if (PILOT_LINK_MAJOR > $pl_ma) {
-						return 0;
-					}
-				} else if (PILOT_LINK_VERSION > $pl_ve) {
-					return 0;
-				}
-				return 1;
-			}
-			],
-			[AC_MSG_RESULT(yes (found $PILOT_LINK_VERSION))],
-			[AC_MSG_ERROR("pilot-link >= $1 required")],
-			[AC_MSG_WARN("No action taken for crosscompile")]
-		)
-		CFLAGS="$CFLAGS_save"
-	fi
-
-	unset piversion_include
-	unset pi_verion
-	unset pi_major
-	unset pi_minor
-	unset pi_patch
-	unset incdir
-	unset pl_mi
-	unset pl_ma
-	unset pl_ve
-])
-
-AC_DEFUN([PILOT_LINK_CHECK],[
-	PILOT_LINK_HOOK($1,[],nofailure)
-])
-
-AC_DEFUN([GNOME_PILOT_HOOK],[
-	AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
-	AC_CACHE_CHECK([for gnome-pilot environment],gnome_cv_pilot_found,[
-		if test "x$GNOME_CONFIG" = "xno"; then
-			gnome_cv_pilot_found=no
-		else
-			# gnome-config doesn't return a useful error status,
-			# so we check if it outputs anything to stderr
-			if test "x`$GNOME_CONFIG gpilot 2>&1 > /dev/null`" = "x"; then
-				gnome_cv_pilot_found=yes
-			else
-				gnome_cv_pilot_found=no
-			fi
-		fi
-	])
-	if test x$gnome_cv_pilot_found = xyes; then
-		if test x$1 != x; then
-			gpv_pre_found=`$GNOME_CONFIG --modversion gpilot`
-			gpv_found=`echo $gpv_pre_found | sed 's/gnome-pilot-\(.*\)/\1/'`
-			AC_MSG_CHECKING([gnome-pilot version ($1)])
-			gpv_major=`echo $gpv_found | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-			gpv_minor=`echo $gpv_found | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-			gpv_patch=`echo $gpv_found | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-			gpv_ma=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-			gpv_mi=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-			gpv_pa=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-			if test $gpv_major -eq $gpv_ma; then
-				if test $gpv_minor -eq $gpv_mi; then
-					if test $gpv_patch -ge $gpv_pa; then
-						AC_MSG_RESULT([yes (found $gpv_found)])
-					else
-						AC_MSG_RESULT([too old (found $gpv_found)])
-						gnome_cv_pilot_found=no
-					fi
-				elif test $gpv_minor -gt $gpv_mi; then
-					AC_MSG_RESULT([yes (found $gpv_found)])
-				else					
-					AC_MSG_RESULT([too old (found $gpv_found)])
-					gnome_cv_pilot_found=no
-				fi
-			else
-				AC_MSG_RESULT([major version mismatch (found $gpv_found)])
-				gnome_cv_pilot_found=no
-			fi
-			unset gpv_pre_found
-			unset gpv_found
-			unset gpv_major
-			unset gpv_minor
-			unset gpv_patch
-			unset gpv_ma
-			unset gpv_mi
-			unset gpv_pa
-		fi
-	fi
-
-	AM_CONDITIONAL(HAVE_GNOME_PILOT,test x$gnome_cv_pilot_found = xyes)
-	if test x$gnome_cv_pilot_found = xyes; then
-		PILOT_LINK_CHECK($2)
-		GNOME_PILOT_CFLAGS=`gnome-config --cflags gpilot`
-		GNOME_PILOT_LIBS=`gnome-config --libs gpilot`
-	else
-		if test x$3 = xfail; then
-			AC_MSG_ERROR([gnome-pilot development package not installed or installation problem])
-		else
-			AC_MSG_WARN([gnome-pilot development package not installed or installation problem])
-		fi
-	fi
-])
-
-AC_DEFUN([GNOME_PILOT_CHECK],[
-	if test x$1 = x; then
-		gpv=[]
-	else
-		gpv=$1
-	fi
-	if test x$2 = x; then
-		plv=0.9.5
-	else
-		plv=$2
-	fi
-	if test x$3 = x; then
-		good=[]
-	else
-		good=$3
-	fi
-		
-	GNOME_PILOT_HOOK($gpv, $plv, $good)
-])
-