updated patch to use pop-3 for service name (#70877), added spamassassin as a dep

6 files changed, 40 insertions, 148 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index f7c3b3097837..24f0ecca8059 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.32 2004/11/12 10:46:50 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.33 2004/11/15 21:26:12 liquidx Exp $
+
+  15 Nov 2004; Alastair Tse <liquidx@gentoo.org>
+  files/evolution-2.0.2-gentoo_etc_services.patch, -evolution-2.0.1.ebuild,
+  evolution-2.0.2.ebuild:
+  updated patch to use pop-3 for service name (#70877), added spamassassin as
+  a dep
 
   12 Nov 2004; Mike Gardiner <obz@gentoo.org> evolution-2.0.2.ebuild:
   Keyworded ppc for GNOME 2.8
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 3c05fef7fedd..229c777fbdef 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,19 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 612c771f03bc55dae16517cdb59053f1 ChangeLog 20834
 MD5 dad6657ce9376178fb561002aa40f5e0 evolution-1.2.4.ebuild 6251
-MD5 9ae6ad1a9a42a147bf2254464d256b08 evolution-2.0.2.ebuild 4020
 MD5 04034205a31f0b0feb05843eb5e64f2e evolution-1.4.6.ebuild 5702
-MD5 59a80ce6170544b792e9b7edbaa34050 ChangeLog 20592
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
-MD5 3fbacd029191e78ebc38dc54dd921fec evolution-2.0.1.ebuild 3778
-MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
-MD5 a9c6167e7a10e30c70d81e4645487275 files/evolution-2.0.2-gentoo_etc_services.patch 1358
+MD5 c5c6a7ae827803a4ee5ae978e5164dae evolution-2.0.2.ebuild 4050
+MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
+MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
-MD5 8a4178ab2571a9be24e1c27cfedf20bb files/evolution-2.0.2-camel_typo.patch 298
+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 6e58f5e7a4195267cc545d8c9eba07a3 files/evolution-1.5.93-addressbooklibs.patch 564
-MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
-MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
-MD5 9c8bfa9074473718f6dd06a73417eed2 files/digest-evolution-2.0.1 70
-MD5 55cb14a4c3057ba1f6d91bea14ec28b6 files/digest-evolution-2.0.2 70
-MD5 dc2deff6647a30a151572ec5d6e11c77 files/evolution-2.0.1-camel.patch 457
 MD5 4df81c3442025403034c53975ba663b1 files/evolution-gcc34.patch 3044
-MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
+MD5 dc2deff6647a30a151572ec5d6e11c77 files/evolution-2.0.1-camel.patch 457
+MD5 55cb14a4c3057ba1f6d91bea14ec28b6 files/digest-evolution-2.0.2 70
+MD5 8cc9e70dc9a35125fa2a37d58be5d139 files/evolution-2.0.2-gentoo_etc_services.patch 1712
+MD5 8a4178ab2571a9be24e1c27cfedf20bb files/evolution-2.0.2-camel_typo.patch 298
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBmR93Rkyva5PS18kRAkUyAJ99VhY9U2aQNF5uH8ubrpfNlAirTACgwytH
+MZlYTePToDEdolJ7vAvod2g=
+=ESfL
+-----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.0.1.ebuild b/mail-client/evolution/evolution-2.0.1.ebuild
deleted file mode 100644
index c24f1baed4a0..000000000000
--- a/mail-client/evolution/evolution-2.0.1.ebuild
+++ /dev/null
@@ -1,133 +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-2.0.1.ebuild,v 1.6 2004/10/18 16:22:26 liquidx 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"
-IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda"
-
-# Top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.2.2
-	>=gnome-extra/gal-2.2.2
-	>=gnome-extra/evolution-data-server-1.0.1
-	>=net-libs/libsoup-2.2
-	>=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 )
-	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}
-	cd ${S}/camel; epatch ${FILESDIR}/evolution-2.0.1-camel.patch
-}
-
-src_compile() {
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	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() {
-
-	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/evolution-2.0.2.ebuild b/mail-client/evolution/evolution-2.0.2.ebuild
index 00c598ecb7b2..14588950a190 100644
--- a/mail-client/evolution/evolution-2.0.2.ebuild
+++ b/mail-client/evolution/evolution-2.0.2.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-2.0.2.ebuild,v 1.11 2004/11/12 10:46:50 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.2.ebuild,v 1.12 2004/11/15 21:26:12 liquidx Exp $
 
 inherit eutils virtualx gnome2 flag-o-matic alternatives
 
@@ -30,6 +30,7 @@ RDEPEND=">=gnome-extra/libgtkhtml-3.2.3
 	>=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 )
diff --git a/mail-client/evolution/files/digest-evolution-2.0.1 b/mail-client/evolution/files/digest-evolution-2.0.1
deleted file mode 100644
index 79f1faae669c..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ceb42376f51410a6b0d83454836e542a evolution-2.0.1.tar.bz2 15230950
diff --git a/mail-client/evolution/files/evolution-2.0.2-gentoo_etc_services.patch b/mail-client/evolution/files/evolution-2.0.2-gentoo_etc_services.patch
index fe680a48a067..7a34c3124ba1 100644
--- a/mail-client/evolution/files/evolution-2.0.2-gentoo_etc_services.patch
+++ b/mail-client/evolution/files/evolution-2.0.2-gentoo_etc_services.patch
@@ -30,3 +30,14 @@ diff -ur camel.new/providers/smtp/camel-smtp-transport.c camel/providers/smtp/ca
  		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
  				      _("Could not connect to %s (port %s): %s"),
 Only in camel/providers/smtp: camel-smtp-transport.c~
+--- camel/providers/pop3/camel-pop3-store.c.old	2004-11-15 18:59:42.001851744 +0000
++++ camel/providers/pop3/camel-pop3-store.c	2004-11-15 18:59:48.603848088 +0000
+@@ -158,7 +158,7 @@
+ 		serv = g_alloca(16);
+ 		sprintf(serv, "%d", service->url->port);
+ 	} else
+-		serv = "pop3";
++		serv = "pop-3";
+ 		
+ 	if (ssl_mode != USE_SSL_NEVER) {
+ #ifdef HAVE_SSL