here is evolution 1.4, gtk2 version of evolution.

11 files changed, 200 insertions, 407 deletions

diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog
index b541f3713d28..f6512374a275 100644
--- a/net-mail/evolution/ChangeLog
+++ b/net-mail/evolution/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/evolution
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.62 2003/06/07 01:36:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.63 2003/06/10 15:10:00 liquidx Exp $
+
+*evolution-1.4.0 (10 Jun 2003)
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.3.ebuild,
+  evolution-1.2.4.ebuild, evolution-1.4.0.ebuild:
+  new evolution 1.4. ebuild revamped and moved back to SLOT 0.
+  You must uninstall any 1.3 versions before installing 1.4!
+  Also added 1.3 version fixes thanks to Stanislav Brabec <utx@gentoo.org>
 
   07 Jun 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.4.ebuild,
   evolution-1.3.2.ebuild, evolution-1.3.3.ebuild, evolution-1.3.92.ebuild:
diff --git a/net-mail/evolution/Manifest b/net-mail/evolution/Manifest
index c4902d376ef8..fc703496b568 100644
--- a/net-mail/evolution/Manifest
+++ b/net-mail/evolution/Manifest
@@ -1,17 +1,14 @@
-MD5 b74e2b59ea2f73fe8c33907ae14361f9 ChangeLog 10053
+MD5 8981df3bd55f780a4cf9644ec257237c ChangeLog 10408
 MD5 186cb5289b83e319145a5543357b43b5 evolution-1.3.92.ebuild 6027
-MD5 fa1991a1637f2d31039a2e28823482c4 evolution-1.3.3.ebuild 5876
-MD5 9e80c4aa7ab078df8dcf68262021ceee evolution-1.3.2.ebuild 5713
-MD5 76afbb2e760479392cc104ecd4e04582 evolution-1.4.0.ebuild 6027
-MD5 1cc8e75189fb601087c0b0e052492f6c evolution-1.2.4.ebuild 6366
-MD5 87cb608d847dc2824bed92faf65ea2d6 evolution-1.2.3.ebuild 5897
-MD5 800aafad27e152cf858dfaf84b9ffc6e files/digest-evolution-1.3.3 132
+MD5 c8d74d56b105beeb9d1c23e2aa2ef211 evolution-1.4.0.ebuild 4371
+MD5 98e402d4aa6c023c9d50d0598c8100e9 evolution-1.2.4.ebuild 6360
+MD5 2f54952fa1d20af7f01db80b741258e7 evolution-1.2.3.ebuild 5889
 MD5 c58e6d56b40d64fc79185915163e87d8 files/digest-evolution-1.3.92 133
 MD5 7a38783a2b9633cc85de53ca692c5159 files/digest-evolution-1.4.0 132
+MD5 421c88eda3d1c318f6214f2103ffaedb files/evolution-1.4.0-bad-1.3.patch 949
 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 980771bb5349699c8d8ecd6b6f035b50 files/gnome-pilot.m4 6452
 MD5 f17beebbd2d9ff5d49f48352be1b359c files/digest-evolution-1.2.3 131
 MD5 3137288dd17e357d0972dab00e4f6b6d files/digest-evolution-1.2.4 1230
-MD5 89f769a5e4e096123a9d74e8803a6cd8 files/digest-evolution-1.3.2 131
diff --git a/net-mail/evolution/evolution-1.2.3.ebuild b/net-mail/evolution/evolution-1.2.3.ebuild
index bc4bd207b61a..2024357403df 100644
--- a/net-mail/evolution/evolution-1.2.3.ebuild
+++ b/net-mail/evolution/evolution-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.3 2003/04/10 06:43:32 vladimir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.2.3.ebuild,v 1.4 2003/06/10 15:10:00 liquidx Exp $
 
 IUSE="ssl nls mozilla ldap doc spell pda ipv6"
 
@@ -22,7 +22,7 @@ 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.23
+	=gnome-extra/gal-0.24*
 	=gnome-base/gconf-1.0*
 	>=gnome-extra/gtkhtml-1.1.8
 	>=gnome-base/oaf-0.6.10
@@ -37,9 +37,9 @@ RDEPEND="app-text/scrollkeeper
 	doc?	 ( >=app-text/scrollkeeper-0.3.10-r1 )
 	ssl? ( mozilla? ( >=net-www/mozilla-0.9.9 ) : ( >=dev-libs/openssl-0.9.5 ) )
 	ldap?    ( >=net-nds/openldap-2.0 )
-	pda?     ( >=gnome-extra/gnome-pilot-0.1.61-r2
+	pda?     ( =gnome-extra/gnome-pilot-0.1*
 			>=dev-libs/pilot-link-0.11.5 )
-	spell?   ( >=app-text/gnome-spell-0.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)
diff --git a/net-mail/evolution/evolution-1.2.4.ebuild b/net-mail/evolution/evolution-1.2.4.ebuild
index 6a236e73c7b7..16ae09d3594c 100644
--- a/net-mail/evolution/evolution-1.2.4.ebuild
+++ b/net-mail/evolution/evolution-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.9 2003/06/07 01:36:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.2.4.ebuild,v 1.10 2003/06/10 15:10:00 liquidx Exp $
 
 IUSE="ssl nls mozilla ldap doc spell pda ipv6 kerberos kde"
 
@@ -22,7 +22,7 @@ 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-extra/gal-0.24*
 	=gnome-base/gconf-1.0*
 	>=gnome-extra/gtkhtml-1.1.10
 	>=gnome-base/oaf-0.6.10
@@ -37,9 +37,9 @@ RDEPEND="app-text/scrollkeeper
 	doc?	 ( >=app-text/scrollkeeper-0.3.10-r1 )
 	ssl? ( mozilla? ( >=net-www/mozilla-0.9.9 ) : ( >=dev-libs/openssl-0.9.5 ) )
 	ldap?    ( >=net-nds/openldap-2.0 )
-	pda?     ( >=gnome-extra/gnome-pilot-0.1.61-r2
+	pda?     ( =gnome-extra/gnome-pilot-0.1*
 			>=dev-libs/pilot-link-0.11.5 )
-	spell?   ( >=app-text/gnome-spell-0.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
diff --git a/net-mail/evolution/evolution-1.3.2.ebuild b/net-mail/evolution/evolution-1.3.2.ebuild
deleted file mode 100644
index 34775d87c1c4..000000000000
--- a/net-mail/evolution/evolution-1.3.2.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.3.2.ebuild,v 1.5 2003/06/07 01:36:56 liquidx Exp $
-
-IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde"
-
-inherit eutils flag-o-matic gnome.org libtool virtualx gnome2
-
-DB3="db-3.1.17"
-S="${WORKDIR}/${P}"
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-#SRC_URI="${SRC_URI} http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
-SRC_URI="ftp://ftp.ximian.com/pub/ximian-evolution-beta/source/${P}.tar.gz
-	http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-
-SLOT="2" # can co-exist with evolution <= 1.2
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-RDEPEND=">=gnome-extra/libgtkhtml-3.0.2
-	>=gnome-base/ORBit2-2.6.0
-    >=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
-    >=gnome-base/bonobo-activation-2.2.1
-    >=dev-libs/libxml2-2.5
-    >=gnome-base/gconf-2.0
-    >=gnome-extra/gal-1.99.3
-    >=net-libs/libsoup-1.99.17
-    >=gnome-base/libgnomecanvas-2.2.0.2
-    >=gnome-base/libgnomeprintui-2.2
-    >=gnome-base/libgnomeprint-2.2
-	doc?	 ( >=app-text/scrollkeeper-0.3.10-r1 )
-	ssl? ( mozilla? ( >=net-www/mozilla-0.9.9 ) : ( >=dev-libs/openssl-0.9.5 ) )
-	ldap?    ( >=net-nds/openldap-2.0 )
-	pda?     ( >=gnome-extra/gnome-pilot-2.0.5
-			>=dev-libs/pilot-link-0.11.7
-            >=gnome-extra/gnome-pilot-conduits-2.0.5 )
-    kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
-	spell?   ( >=app-text/gnome-spell-1.0.2 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/libtool-1.4.1-r1
-	>=dev-util/intltool-0.20
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )"
-
-pkg_setup() {
-    ewarn "This is a Preview Release. According to Ximian : "
-    echo
-    ewarn "These snapshots of Evolution are UNSTABLE. This means"
-    ewarn "that it will probably crash very often, and possibly eat"
-    ewarn "your mail, calendar, appointments, anything. The purpose"
-    ewarn "of this release is to help users to test the new code; use"
-    ewarn "at your own risk, but please do report the bugs."
-    echo
-    ewarn "It is highly recommended that you make a backup of your 1.2"
-    ewarn "~/evolution directory before switching to Evolution 1.3 to"
-    ewarn "prevent data loss. If you are using POP mail, please consider"
-    ewarn "using the \"Leave messages on server\" option to prevent your"
-    ewarn "mail from being erased on the server after download."
-    echo
-    ewarn "Please read this page for more info:"
-    ewarn "http://developer.ximian.com/projects/evolution/release_notes/1.3.2.html"
-}
-
-src_compile() {
-
-	# *************************************************************
-	#
-	#   DB3 compile...
-	#
-	# *************************************************************
-
-	# Rather ugly hack to make sure pthread mutex support are not enabled ...
-	cd ${WORKDIR}/${DB3}/dist
-	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
-    
-    # Kerberos
-	if [ -n "`use kerberos`" ]; then
-		myconf="${myconf} --with-krb5=/usr"
-    else
-    	myconf="${myconf} --without-krb5"
-    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
-
-	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 \
-		${myconf} || die
-
-	#needs to be able to connect to X display to build.
-	Xemake || Xmake || die
-}
-
-src_install() {
-
-    # fix kde shortcut otherwise make install fails (evo-1.3.1)
-    cd ${S}/data
-    cp Makefile Makefile.old
-	sed -e 's,^install-kde-applnk:,install-kde-applnk:\n\t$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir); \\,' Makefile.old > Makefile
-    rm Makefile.old
-
-	cd ${S}
-	export USE_DESTDIR="1"
-	export DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
-	gnome2_src_install "KDE_APPLNK_DIR=/usr/share/applnk"
-	
-	# remove kde applnk if -kde
-	if [ -z "`use kde`" ]; then
-		rm -rf ${D}/usr/share/applnk
-	fi
-
-}
diff --git a/net-mail/evolution/evolution-1.3.3.ebuild b/net-mail/evolution/evolution-1.3.3.ebuild
deleted file mode 100644
index 1afad2cfbecd..000000000000
--- a/net-mail/evolution/evolution-1.3.3.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.3.3.ebuild,v 1.4 2003/06/07 01:36:56 liquidx Exp $
-
-IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde"
-
-inherit eutils flag-o-matic gnome.org libtool virtualx debug gnome2
-
-DB3="db-3.1.17"
-S="${WORKDIR}/${P}"
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="${SRC_URI} http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
-#SRC_URI="ftp://ftp.ximian.com/pub/ximian-evolution-beta/source/${P}.tar.gz
-#	http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-
-SLOT="2" # can co-exist with evolution <= 1.2
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-# top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.0.3
-    >=gnome-extra/gal-1.99.4
-    >=net-libs/libsoup-1.99.20
-	pda?     ( >=gnome-extra/gnome-pilot-2.0.8
-		>=dev-libs/pilot-link-0.11.7
-		>=gnome-extra/gnome-pilot-conduits-2.0.8 )
-	spell?   ( >=app-text/gnome-spell-1.0.3 )
-	
-	>=gnome-base/ORBit2-2.6.0
-    >=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
-    >=gnome-base/bonobo-activation-2.2.1
-    >=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
-	doc?	 ( >=app-text/scrollkeeper-0.3.10-r1 )
-	ssl? ( mozilla? ( >=net-www/mozilla-0.9.9 ) : ( >=dev-libs/openssl-0.9.5 ) )
-	ldap?    ( >=net-nds/openldap-2.0 )
-    kerberos? ( >=app-crypt/mit-krb5-1.2.5 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/libtool-1.4.1-r1
-	>=dev-util/intltool-0.20
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )"
-
-pkg_setup() {
-    ewarn "This is a Preview Release. According to Ximian : "
-    echo
-    ewarn "These snapshots of Evolution are UNSTABLE. This means"
-    ewarn "that it will probably crash very often, and possibly eat"
-    ewarn "your mail, calendar, appointments, anything. The purpose"
-    ewarn "of this release is to help users to test the new code; use"
-    ewarn "at your own risk, but please do report the bugs."
-    echo
-    ewarn "It is highly recommended that you make a backup of your 1.2"
-    ewarn "~/evolution directory before switching to Evolution 1.3 to"
-    ewarn "prevent data loss. If you are using POP mail, please consider"
-    ewarn "using the \"Leave messages on server\" option to prevent your"
-    ewarn "mail from being erased on the server after download."
-    echo
-    ewarn "Please read this page for more info:"
-    ewarn "http://developer.ximian.com/projects/evolution/release_notes/1.3.3.html"
-	sleep 5
-	
-}
-
-src_unpack() {
-	unpack ${A}
-	# remove dependency on libdb1.so (its deprecated)
-	cd ${S}; sed -i -e "s/-ldb1//" configure	
-}
-
-src_compile() {
-
-	# *************************************************************
-	#
-	#   DB3 compile...
-	#
-	# *************************************************************
-
-	# Rather ugly hack to make sure pthread mutex support are not enabled ...
-	cd ${WORKDIR}/${DB3}/dist
-	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
-    
-    # Kerberos
-	if [ -n "`use kerberos`" ]; then
-		myconf="${myconf} --with-krb5=/usr"
-    else
-    	myconf="${myconf} --without-krb5"
-    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
-
-	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 \
-		${myconf} || die
-
-	#needs to be able to connect to X display to build.
-	Xemake || Xmake || die
-}
-
-src_install() {
-
-    # fix kde shortcut otherwise make install fails (evo-1.3.1)
-    cd ${S}/data
-    cp Makefile Makefile.old
-	sed -e 's,^install-kde-applnk:,install-kde-applnk:\n\t$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir); \\,' Makefile.old > Makefile
-    rm Makefile.old
-
-	cd ${S}
-	export USE_DESTDIR="1"
-	export DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
-	gnome2_src_install "KDE_APPLNK_DIR=/usr/share/applnk"
-	
-	# remove kde applnk if -kde
-	if [ -z "`use kde`" ]; then
-		rm -rf ${D}/usr/share/applnk
-	fi
-
-}
diff --git a/net-mail/evolution/evolution-1.4.0.ebuild b/net-mail/evolution/evolution-1.4.0.ebuild
new file mode 100644
index 000000000000..f6efd31b6841
--- /dev/null
+++ b/net-mail/evolution/evolution-1.4.0.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2003 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.0.ebuild,v 1.1 2003/06/10 15:10:00 liquidx Exp $
+
+IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde"
+
+inherit flag-o-matic virtualx debug gnome2
+use kde && inherit kde
+
+DB3="db-3.1.17"
+S="${WORKDIR}/${P}"
+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"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+# top stanza are ximian deps
+RDEPEND=">=gnome-extra/libgtkhtml-3.0.5
+    >=gnome-extra/gal-1.99.7
+    >=net-libs/libsoup-1.99.23
+	pda?     ( >=gnome-extra/gnome-pilot-2.0.9
+		>=dev-libs/pilot-link-0.11.7
+		>=gnome-extra/gnome-pilot-conduits-2.0.9 )
+	spell?   ( >=app-text/gnome-spell-1.0.4 )
+	
+	>=gnome-base/ORBit2-2.6.0
+    >=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
+    >=gnome-base/bonobo-activation-2.2.1
+    >=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
+	doc?	 ( >=app-text/scrollkeeper-0.3.10-r1 )
+	ssl? ( mozilla? ( >=net-www/mozilla-0.9.9 ) : ( >=dev-libs/openssl-0.9.5 ) )
+	ldap?    ( >=net-nds/openldap-2.0 )
+    kerberos? ( >=app-crypt/mit-krb5-1.2.5 )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	>=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 \"=net-mail/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
+	# fix desktop link
+	epatch ${FILESDIR}/evolution-1.4.0-bad-1.3.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
+	make prefix=${WORKDIR}/db3 install || die
+
+}
+
+src_compile() {
+
+	# compile evo specific version of db3
+	src_compile_db3
+
+	einfo "Compiling Evolution..."
+	cd ${S}
+  
+	local myconf=""
+	local MOZILLA="${MOZILLA_FIVE_HOME}"
+
+	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 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
+
+	econf --with-db3=${WORKDIR}/db3 ${myconf} || die
+
+	# regenerate evolution.desktop
+	cd ${S}/data; make evolution.desktop; cd ${S}
+
+	#needs to be able to connect to X display to build.
+	Xemake || Xmake || die
+}
+
+src_install() {
+	export USE_DESTDIR="1"
+	export DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
+	gnome2_src_install
+}	
diff --git a/net-mail/evolution/files/digest-evolution-1.3.2 b/net-mail/evolution/files/digest-evolution-1.3.2
deleted file mode 100644
index 95df45670bbe..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.3.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 25d61664642b2cebc8b8eb63d023a1b5 evolution-1.3.2.tar.gz 15956467
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.3.3 b/net-mail/evolution/files/digest-evolution-1.3.3
deleted file mode 100644
index b67e03791bfe..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.3.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d9a6f15317e5f208af6e64f7894dbabb evolution-1.3.3.tar.bz2 12251167
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.4.0 b/net-mail/evolution/files/digest-evolution-1.4.0
new file mode 100644
index 000000000000..a28b1af8e124
--- /dev/null
+++ b/net-mail/evolution/files/digest-evolution-1.4.0
@@ -0,0 +1,2 @@
+MD5 cc671769a912e315dc895f5b458e1a33 evolution-1.4.0.tar.bz2 12844056
+MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/evolution-1.4.0-bad-1.3.patch b/net-mail/evolution/files/evolution-1.4.0-bad-1.3.patch
new file mode 100644
index 000000000000..9df5cf4c2510
--- /dev/null
+++ b/net-mail/evolution/files/evolution-1.4.0-bad-1.3.patch
@@ -0,0 +1,24 @@
+diff -ur evolution-1.4.0.orig/data/evolution.desktop.in evolution-1.4.0/data/evolution.desktop.in
+--- evolution-1.4.0.orig/data/evolution.desktop.in	2003-03-26 17:13:05.000000000 +0100
++++ evolution-1.4.0/data/evolution.desktop.in	2003-06-10 13:51:55.000000000 +0200
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ _Name=Ximian Evolution
+ _Comment=The Evolution groupware suite
+-Exec=evolution-1.3
+-Icon=evolution-1.3.png
++Exec=evolution-1.4
++Icon=evolution-1.4.png
+ Terminal=false
+ Type=Application
+ Categories=GNOME;Application;Office;X-Red-Hat-Base;
+diff -ur evolution-1.4.0.orig/shell/evolution-nognome.in evolution-1.4.0/shell/evolution-nognome.in
+--- evolution-1.4.0.orig/shell/evolution-nognome.in	2003-04-29 20:14:49.000000000 +0200
++++ evolution-1.4.0/shell/evolution-nognome.in	2003-06-10 13:55:20.000000000 +0200
+@@ -9,5 +9,5 @@
+ 
+ export LD_LIBRARY_PATH GNOME2_PATH PATH
+ 
+-exec @libexecdir@/evolution-1.3 "$@"
++exec @libexecdir@/evolution-1.4 "$@"
+