version bump. workaround for gentoo /etc/services being out of date (#66166)

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 7bebb5d05eee1a7771c3bff3c981605e2ba527c0..f24879db4e64e069eb37f61aa34b808429d71adb 100644 (file)
--- 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.22 2004/10/05 19:32:41 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.23 2004/10/16 19:22:16 liquidx Exp $
+
+*evolution-2.0.2 (16 Oct 2004)
+
+  16 Oct 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/evolution-2.0.2-gentoo_etc_services.patch, +evolution-2.0.2.ebuild:
+  version bump. workaround for gentoo /etc/services being out of date (#66166)
 
   04 Oct 2004; Alastair Tse <liquidx@gentoo.org> evolution-1.4.6.ebuild:
   pegged gal/libgtkhtml/libsoup dependency for evo-1.4.6

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 95dee59d04b6cebf7c77abe2f9572fcdc8280f36..da3d87495a70a808501b181b0954efd10995a7b7 100644 (file)
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,17 +1,18 @@
-MD5 84849903257a87f8540ac47b46b316e9 ChangeLog 19279
+MD5 eadabe1feb94baae895dbbc05ef4a76c ChangeLog 19517
 MD5 dad6657ce9376178fb561002aa40f5e0 evolution-1.2.4.ebuild 6251
 MD5 a30d8d424a2ad9eb49940d78310542ca evolution-1.4.6.ebuild 5570
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
 MD5 1f8d7a02bc9ad9d63e5801b41fcdb6e2 evolution-2.0.1.ebuild 3797
-MD5 b5703f0e5fbf5b83410e8ac9faa40a71 evolution-2.0.0.ebuild 3705
+MD5 d76a9f658d7dc1269e16c088deee559f evolution-2.0.2.ebuild 3863
 MD5 3137288dd17e357d0972dab00e4f6b6d files/digest-evolution-1.2.4 1230
 MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
 MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
 MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
 MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
+MD5 6e58f5e7a4195267cc545d8c9eba07a3 files/evolution-1.5.93-addressbooklibs.patch 564
+MD5 4df81c3442025403034c53975ba663b1 files/evolution-gcc34.patch 3044
 MD5 9c8bfa9074473718f6dd06a73417eed2 files/digest-evolution-2.0.1 70
 MD5 dc2deff6647a30a151572ec5d6e11c77 files/evolution-2.0.1-camel.patch 457
-MD5 4df81c3442025403034c53975ba663b1 files/evolution-gcc34.patch 3044
-MD5 c99745f20c250a825bdda526f4209210 files/digest-evolution-2.0.0 70
-MD5 6e58f5e7a4195267cc545d8c9eba07a3 files/evolution-1.5.93-addressbooklibs.patch 564
+MD5 55cb14a4c3057ba1f6d91bea14ec28b6 files/digest-evolution-2.0.2 70
+MD5 a9c6167e7a10e30c70d81e4645487275 files/evolution-2.0.2-gentoo_etc_services.patch 1358

diff --git a/mail-client/evolution/evolution-2.0.0.ebuild b/mail-client/evolution/evolution-2.0.2.ebuild
similarity index 88%
rename from mail-client/evolution/evolution-2.0.0.ebuild
rename to mail-client/evolution/evolution-2.0.2.ebuild
index 112c45561bad4ed3c2fdc40bed921aa7eefd9427..2ea86cbb2e1a978f11d38eda963e1ed74b311f7b 100644 (file)
--- a/mail-client/evolution/evolution-2.0.0.ebuild
+++ b/mail-client/evolution/evolution-2.0.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.0.ebuild,v 1.6 2004/10/11 13:15:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.2.ebuild,v 1.1 2004/10/16 19:22:16 liquidx Exp $
 
-inherit eutils virtualx gnome2 flag-o-matic
+inherit eutils virtualx gnome2 flag-o-matic alternatives
 
 DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
 HOMEPAGE="http://ximian.com/products/evolution/"
@@ -13,10 +13,10 @@ KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~mips ~hppa"
 IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda"
 
 # Top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.2.1
-       >=gnome-extra/gal-2.2.1
-       >=gnome-extra/evolution-data-server-1
-       >=net-libs/libsoup-2.2
+RDEPEND=">=gnome-extra/libgtkhtml-3.2.3
+       >=gnome-extra/gal-2.2.3
+       >=gnome-extra/evolution-data-server-1.0.2
+       >=net-libs/libsoup-2.2.1
        >=dev-libs/glib-2
        >=dev-libs/libxml2-2
        >=gnome-base/gconf-2
@@ -63,9 +63,9 @@ ELTCONF="--reverse-deps"
 
 src_unpack() {
        unpack ${A}
-
        cd ${S}
-       epatch ${FILESDIR}/evolution-1.5.93-addressbooklibs.patch
+       # bug #66166 -- temporary workaround until new baselayout exists
+       epatch ${FILESDIR}/${P}-gentoo_etc_services.patch
 }
 
 src_compile() {
@@ -124,6 +124,7 @@ src_compile() {
 
 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'"

diff --git a/mail-client/evolution/files/digest-evolution-2.0.0 b/mail-client/evolution/files/digest-evolution-2.0.0
deleted file mode 100644 (file)
index ffe780b..0000000
--- a/mail-client/evolution/files/digest-evolution-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b36c4b99cd03bb4178569f90ac32022 evolution-2.0.0.tar.bz2 14985256

diff --git a/mail-client/evolution/files/digest-evolution-2.0.2 b/mail-client/evolution/files/digest-evolution-2.0.2
new file mode 100644 (file)
index 0000000..568f8e8
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.0.2
@@ -0,0 +1 @@
+MD5 d3f12240ebb05dc6c984af68b5fe1955 evolution-2.0.2.tar.bz2 15400311

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
new file mode 100644 (file)
index 0000000..fe680a4
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.0.2-gentoo_etc_services.patch
@@ -0,0 +1,32 @@
+diff -ur camel.new/providers/imap/camel-imap-store.c camel/providers/imap/camel-imap-store.c
+--- camel.new/providers/imap/camel-imap-store.c        2004-10-11 16:24:23.000000000 +0100
++++ camel/providers/imap/camel-imap-store.c    2004-10-16 19:15:55.001915080 +0100
+@@ -533,7 +533,7 @@
+               serv = g_alloca(16);
+               sprintf(serv, "%d", service->url->port);
+       } else
+-              serv = "imap";
++              serv = "imap2";
+       
+       if (ssl_mode != USE_SSL_NEVER) {
+ #ifdef HAVE_SSL
+Only in camel/providers/imap: camel-imap-store.c~
+diff -ur camel.new/providers/smtp/camel-smtp-transport.c camel/providers/smtp/camel-smtp-transport.c
+--- camel.new/providers/smtp/camel-smtp-transport.c    2004-10-11 16:24:25.000000000 +0100
++++ camel/providers/smtp/camel-smtp-transport.c        2004-10-16 19:17:28.491702472 +0100
+@@ -260,12 +260,12 @@
+                       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";
+                       tcp_stream = camel_tcp_stream_ssl_new (service->session, service->url->host, SSL_PORT_FLAGS);
+               }
+ #else
+               if (!try_starttls && service->url->port == 0)
+-                      serv = "smtps";
++                      serv = "ssmtp";
+               
+               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~