Version bump and fixes

6 files changed, 216 insertions, 9 deletions

diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog
index d059004ca684..ee591c0f2d80 100644
--- a/net-mail/evolution/ChangeLog
+++ b/net-mail/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # 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.56 2003/04/28 23:46:43 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.57 2003/05/07 11:22:39 liquidx Exp $
+
+*evolution-1.3.3 (07 May 2003)
+
+  07 May 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.4.ebuild,
+  evolution-1.3.2.ebuild, evolution-1.3.3.ebuild:
+  version bump. also removed -ldb1 from mozilla nss cflags.
 
   29 Apr 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.4.ebuild:
   bumped 1.2.4 to stable for x86
diff --git a/net-mail/evolution/Manifest b/net-mail/evolution/Manifest
index a39fe3505d22..657fa651202a 100644
--- a/net-mail/evolution/Manifest
+++ b/net-mail/evolution/Manifest
@@ -1,7 +1,9 @@
-MD5 9a3c1d3513ba4070275aba2e5a7ca048 ChangeLog 9131
-MD5 6c313f8cab4d4ea7ec6413d261593985 evolution-1.3.2.ebuild 5751
-MD5 6e1d601903f669226c35a5026a7b0f5f evolution-1.2.4.ebuild 6243
+MD5 e84b269707c37f9c096c9ef8e3280a80 ChangeLog 9347
+MD5 dc85b9932dde6f7da1e9010b7f98de64 evolution-1.3.3.ebuild 5848
+MD5 8eb521e7427b37ad0b11b9a14afd6662 evolution-1.3.2.ebuild 5691
+MD5 2a4bdf000b24bfcbf7dba89e655d505e evolution-1.2.4.ebuild 6338
 MD5 87cb608d847dc2824bed92faf65ea2d6 evolution-1.2.3.ebuild 5897
+MD5 800aafad27e152cf858dfaf84b9ffc6e files/digest-evolution-1.3.3 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
diff --git a/net-mail/evolution/evolution-1.2.4.ebuild b/net-mail/evolution/evolution-1.2.4.ebuild
index 5358a1d99369..b63269fc67ab 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.4 2003/04/28 23:46:44 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.2.4.ebuild,v 1.5 2003/05/07 11:22:39 liquidx Exp $
 
 IUSE="ssl nls mozilla ldap doc spell pda ipv6 kerberos kde"
 
@@ -78,6 +78,9 @@ src_unpack() {
 	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() {
diff --git a/net-mail/evolution/evolution-1.3.2.ebuild b/net-mail/evolution/evolution-1.3.2.ebuild
index 7b4703d4688f..e1275f6d46a0 100644
--- a/net-mail/evolution/evolution-1.3.2.ebuild
+++ b/net-mail/evolution/evolution-1.3.2.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.3.2.ebuild,v 1.2 2003/04/23 22:16:47 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.3.2.ebuild,v 1.3 2003/05/07 11:22:39 liquidx Exp $
 
 IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde"
 
@@ -168,9 +168,6 @@ src_compile() {
 
 src_install() {
 
-	# get ready for scrollkeeper
-	dodir /var/lib/scrollkeeper
-
     # fix kde shortcut otherwise make install fails (evo-1.3.1)
     cd ${S}/data
     cp Makefile Makefile.old
diff --git a/net-mail/evolution/evolution-1.3.3.ebuild b/net-mail/evolution/evolution-1.3.3.ebuild
new file mode 100644
index 000000000000..53fc0e5793a5
--- /dev/null
+++ b/net-mail/evolution/evolution-1.3.3.ebuild
@@ -0,0 +1,197 @@
+# 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.1 2003/05/07 11:22:39 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"
+
+# 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/krb5-1.2.5 )"
+
+DEPEND="${RDEPEND}
+	>=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/files/digest-evolution-1.3.3 b/net-mail/evolution/files/digest-evolution-1.3.3
new file mode 100644
index 000000000000..b67e03791bfe
--- /dev/null
+++ b/net-mail/evolution/files/digest-evolution-1.3.3
@@ -0,0 +1,2 @@
+MD5 d9a6f15317e5f208af6e64f7894dbabb evolution-1.3.3.tar.bz2 12251167
+MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117