New version

5 files changed, 193 insertions, 11 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index efb2bd3f9eaf..9846acbf0f32 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.36 2004/12/23 16:59:03 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.37 2004/12/29 17:12:27 obz Exp $
+
+*evolution-2.0.3 (30 Dec 2004)
+
+  30 Dec 2004; Mike Gardiner <obz@gentoo.org>
+  +files/evolution-2.0.3-gentoo_etc_services.patch, +evolution-2.0.3.ebuild:
+  New version
 
   23 Dec 2004; Guy Martin <gmsoft@gentoo.org> evolution-2.0.2.ebuild:
   Stable on hppa.
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index a66b88d62b23..aa4c7b34b4d7 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,17 +1,20 @@
-MD5 a8c1bec41f3d24c829ecd62336275796 ChangeLog 21115
 MD5 dad6657ce9376178fb561002aa40f5e0 evolution-1.2.4.ebuild 6251
+MD5 01524153980fa4869acc8b414a8e48da evolution-2.0.3.ebuild 3860
+MD5 d2e40ea76259c876593c6ac19acc9412 evolution-2.0.2.ebuild 4054
 MD5 04034205a31f0b0feb05843eb5e64f2e evolution-1.4.6.ebuild 5702
+MD5 a8c1bec41f3d24c829ecd62336275796 ChangeLog 21115
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
-MD5 d2e40ea76259c876593c6ac19acc9412 evolution-2.0.2.ebuild 4054
-MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
-MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
-MD5 55cb14a4c3057ba1f6d91bea14ec28b6 files/digest-evolution-2.0.2 70
+MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
+MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
+MD5 8cc9e70dc9a35125fa2a37d58be5d139 files/evolution-2.0.2-gentoo_etc_services.patch 1712
 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
-MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
+MD5 8a4178ab2571a9be24e1c27cfedf20bb files/evolution-2.0.2-camel_typo.patch 298
 MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
-MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
 MD5 6e58f5e7a4195267cc545d8c9eba07a3 files/evolution-1.5.93-addressbooklibs.patch 564
-MD5 4df81c3442025403034c53975ba663b1 files/evolution-gcc34.patch 3044
+MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
+MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
+MD5 55cb14a4c3057ba1f6d91bea14ec28b6 files/digest-evolution-2.0.2 70
+MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3 70
 MD5 dc2deff6647a30a151572ec5d6e11c77 files/evolution-2.0.1-camel.patch 457
-MD5 8a4178ab2571a9be24e1c27cfedf20bb files/evolution-2.0.2-camel_typo.patch 298
-MD5 8cc9e70dc9a35125fa2a37d58be5d139 files/evolution-2.0.2-gentoo_etc_services.patch 1712
+MD5 4df81c3442025403034c53975ba663b1 files/evolution-gcc34.patch 3044
+MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
diff --git a/mail-client/evolution/evolution-2.0.3.ebuild b/mail-client/evolution/evolution-2.0.3.ebuild
new file mode 100644
index 000000000000..3e4eb060c14f
--- /dev/null
+++ b/mail-client/evolution/evolution-2.0.3.ebuild
@@ -0,0 +1,136 @@
+# 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-2.0.3.ebuild,v 1.1 2004/12/29 17:12:27 obz Exp $
+
+inherit eutils virtualx gnome2 flag-o-matic alternatives
+
+DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
+HOMEPAGE="http://ximian.com/products/evolution/"
+
+LICENSE="GPL-2"
+SLOT="2.0"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~ia64 ~mips ~alpha"
+IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda"
+
+# Top stanza are ximian deps
+RDEPEND=">=gnome-extra/libgtkhtml-3.2.4
+	>=gnome-extra/gal-2.2.4
+	>=gnome-extra/evolution-data-server-1.0.3
+	>=net-libs/libsoup-2.2.1
+	>=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
+	>=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
+	mail-filter/spamassassin
+	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.4.1
+			>=dev-libs/nss-3.9.2 ) )
+	ldap? ( >=net-nds/openldap-2 )
+	kerberos? ( virtual/krb5 )"
+
+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
+	>=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_DESTDIR="1"
+DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
+ELTCONF="--reverse-deps"
+
+src_unpack() {
+	unpack ${A}
+	# bug #66166 -- temporary workaround until new baselayout exists
+	epatch ${FILESDIR}/${P}-gentoo_etc_services.patch
+}
+
+src_compile() {
+	# problems with -O3 on gcc-3.3.1
+	replace-flags -O3 -O2
+
+	if [ "${ARCH}" = "hppa" ]; then
+		append-flags "-fPIC -ffunction-sections"
+		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+	fi
+
+	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
+			NSPR_LIB=/usr/lib/mozilla
+			NSS_INC=/usr/lib/mozilla/include/nss
+			NSPR_INC=/usr/lib/mozilla/include/nspr
+		else
+			NSS_LIB=/usr/lib/nss
+			NSPR_LIB=/usr/lib/nspr
+			NSS_INC=/usr/include/nss
+			NSPR_INC=/usr/include/nspr
+		fi
+
+		myconf="${myconf} --enable-nss=yes \
+			--with-nspr-includes=${NSPR_INC} \
+			--with-nspr-libs=${NSPR_LIB} \
+			--with-nss-includes=${NSS_INC} \
+			--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() {
+
+	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
+	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-2.0.3 b/mail-client/evolution/files/digest-evolution-2.0.3
new file mode 100644
index 000000000000..cd4b309c65c4
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.0.3
@@ -0,0 +1 @@
+MD5 0a6c15b022f001d52b8533c42e83a462 evolution-2.0.3.tar.bz2 15381448
diff --git a/mail-client/evolution/files/evolution-2.0.3-gentoo_etc_services.patch b/mail-client/evolution/files/evolution-2.0.3-gentoo_etc_services.patch
new file mode 100644
index 000000000000..41b20cb9302e
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.0.3-gentoo_etc_services.patch
@@ -0,0 +1,36 @@
+diff -ur evolution-2.0.3/camel/providers/imap/camel-imap-store.c evolution-2.0.3-patched/camel/providers/imap/camel-imap-store.c
+--- evolution-2.0.3/camel/providers/imap/camel-imap-store.c	2004-12-06 15:46:51.000000000 +0800
++++ evolution-2.0.3-patched/camel/providers/imap/camel-imap-store.c	2004-12-30 00:26:50.274319864 +0800
+@@ -534,7 +534,7 @@
+ 		serv = g_alloca(16);
+ 		sprintf(serv, "%d", service->url->port);
+ 	} else {
+-		serv = "imap";
++		serv = "imap2";
+ 		port = IMAP_PORT;
+ 	}
+ 	
+diff -ur evolution-2.0.3/camel/providers/pop3/camel-pop3-store.c evolution-2.0.3-patched/camel/providers/pop3/camel-pop3-store.c
+--- evolution-2.0.3/camel/providers/pop3/camel-pop3-store.c	2004-12-06 15:46:51.000000000 +0800
++++ evolution-2.0.3-patched/camel/providers/pop3/camel-pop3-store.c	2004-12-30 00:28:05.128940232 +0800
+@@ -159,7 +159,7 @@
+ 		serv = g_alloca(16);
+ 		sprintf(serv, "%d", service->url->port);
+ 	} else {
+-		serv = "pop3";
++		serv = "pop-3";
+ 		port = "110";
+ 	}
+ 		
+diff -ur evolution-2.0.3/camel/providers/smtp/camel-smtp-transport.c evolution-2.0.3-patched/camel/providers/smtp/camel-smtp-transport.c
+--- evolution-2.0.3/camel/providers/smtp/camel-smtp-transport.c	2004-12-06 15:46:52.000000000 +0800
++++ evolution-2.0.3-patched/camel/providers/smtp/camel-smtp-transport.c	2004-12-30 00:27:21.094634464 +0800
+@@ -263,7 +263,7 @@
+ 			tcp_stream = camel_tcp_stream_ssl_new_raw (service->session, service->url->host, STARTTLS_FLAGS);
+ 		} else {
+ 			if (service->url->port == 0) {
+-				serv = "smtps";
++				serv = "ssmtp";
+ 				port = "465";
+ 			}
+ 			tcp_stream = camel_tcp_stream_ssl_new (service->session, service->url->host, SSL_PORT_FLAGS);