add some patches

5 files changed, 254 insertions, 2 deletions

diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog
index f419d5bacb4f..6a16c1904905 100644
--- a/net-mail/evolution/ChangeLog
+++ b/net-mail/evolution/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for net-mail/evolution
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.33 2002/12/09 04:33:14 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.34 2002/12/09 20:11:25 azarah Exp $
 
-\* Autoupdate keywords (12-6-02)
+*evolution-1.2.0-r1 (09 Dec 2002)
+
+  09 Dec 2002; Martin Schlemmer <azarah@gentoo.org> evolution-1.2.0-r1.ebuild :
+  Add sharedldap.patch and settingscrash.patch from Mandrake to:
+  - Fix LDAP support (hopefully enable searching, but compiles fine).
+  - Fix a crash in settings if some variables not initialized.
+
+* Autoupdate keywords (12-6-02)
   06 Dec 2002; Rodney Rees <manson@gentoo.org> changed sparc ~sparc keywords
  
   02 Dec 2002; foser <foser@gentoo.org> evolution-1.2.0.ebuild :
diff --git a/net-mail/evolution/evolution-1.2.0-r1.ebuild b/net-mail/evolution/evolution-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..dfbb7017d1ac
--- /dev/null
+++ b/net-mail/evolution/evolution-1.2.0-r1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2002 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.0-r1.ebuild,v 1.1 2002/12/09 20:11:25 azarah Exp $
+
+IUSE="ssl nls mozilla ldap doc spell pda ipv6"
+
+#provide Xmake and Xemake
+
+inherit eutils gnome.org virtualx libtool
+
+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/3.1.17/${DB3}.tar.gz"
+HOMEPAGE="http://www.ximian.com"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
+
+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.21
+	=gnome-base/gconf-1.0*
+	>=gnome-extra/gtkhtml-1.1.5
+	>=gnome-base/oaf-0.6.10
+	>=gnome-base/ORBit-0.5.12
+	( >=gnome-base/libglade-0.17-r1
+	  <gnome-base/libglade-2.0 )		
+	>=media-libs/gdk-pixbuf-0.18.0
+	>=dev-libs/libxml-1.8.17
+	=gnome-base/gnome-vfs-1.0*		
+	>=gnome-base/gnome-print-0.35
+	>=dev-util/gob-1.0.12
+	>=net-libs/soup-0.7.4-r1
+	doc?	 ( >=app-text/scrollkeeper-0.3.10-r1 )
+	ssl?     ( >=net-www/mozilla-0.9.9 )
+	ssl?     ( >=dev-libs/openssl-0.9.5 )
+	ldap?    ( >=net-nds/openldap-2.0 )
+	mozilla? ( >=net-www/mozilla-0.9.9 )
+	pda?     ( >=gnome-extra/gnome-pilot-0.1.61-r2
+			>=dev-libs/pilot-link-0.11.5 )
+	spell?   ( >=app-text/gnome-spell-0.5 )"
+
+# the pilot-link dep is normally covered by gnome-pilot, but evo
+# requires an higher version then gnome-pilot (bug #10307)
+
+#	ssl?     ( mozilla? ( >=net-www/mozilla-0.9.9 ) )
+#	ssl?     ( !mozilla? ( >=dev-libs/openssl-0.9.5 ) )
+# This is how the deps should be, but portage cannot handle it
+
+# Added dependency on "dev-util/gob" this should fix a configure bug
+
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-1.4.1-r1
+	doc? ( dev-util/gtk-doc )
+	nls?  ( >=dev-util/intltool-0.20
+	        sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	
+	cd ${S};
+	# Mandrake patches
+	epatch ${FILESDIR}/${PN}-1.1.90-kde.patch
+	epatch ${FILESDIR}/${PN}-1.1.90-scrollkeeper.patch
+	epatch ${FILESDIR}/${PN}-1.1.90-subversion.patch
+	epatch ${FILESDIR}/${PN}-1.1.90-utf8.patch
+	epatch ${FILESDIR}/${PN}-1.1.90-sharedldap.patch
+	epatch ${FILESDIR}/${PN}-1.2.0-settingscrash.patch
+	
+	# libtoolize to fix not all libs installing, and buggy .la files.
+	# also add the gnome-pilot.m4 to the macros directory to fix
+	# problems with the pilot conduct
+	cd ${S}; cp -f ltmain.sh ${S}/libical/
+	elibtoolize --reverse-deps
+	aclocal -I macros -I /usr/share/aclocal/gnome-macros
+	autoconf
+	automake --add-missing
+	
+	(cd libical ; aclocal -I /usr/share/aclocal/gnome-macros ; autoconf)
+
+	# Fix sandbox errors
+	cd ${S}/default_user
+	cp Makefile.in Makefile.in.orig
+	sed -e 's:-mkdir $(defaultdir:-mkdir $(DESTDIR)$(defaultdir:g' \
+		Makefile.in.orig > Makefile.in
+}
+
+src_compile() {
+
+	# *************************************************************
+	#
+	#   DB3 compile...
+	#
+	# *************************************************************
+
+	einfo "Compiling DB3..."
+	cd ${WORKDIR}/${DB3}/build_unix
+	../dist/configure --prefix=${WORKDIR}/db3 || die
+
+	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
+
+	# 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`" ] && [ -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
+
+	if [ -z "`use nls`" ] ; then
+		myconf="${myconf} --disable-nls"
+	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 \
+		--disable-python-bindings \
+		${myconf} || die
+
+	#needs to be able to connect to X display to build.
+	Xemake || Xmake || die
+}
+
+src_install() {
+	cd omf-install
+	cp Makefile Makefile.old
+	sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
+	rm Makefile.old
+	cd ${S}
+
+	# Install with $DESTDIR, as in some rare cases $D gets hardcoded
+	# into the binaries (seems like a ccache problem at present),
+	# because everything is recompiled with the "new" PREFIX, if
+	# $DESTDIR is _not_ used.
+	make DESTDIR=${D} \
+		prefix=/usr \
+		mandir=/usr/share/man \
+		infodir=/usr/share/info \
+		datadir=/usr/share \
+		sysconfdir=/etc \
+		localstatedir=/var/lib \
+		KDE_APPLNK_DIR=/usr/share/applnk \
+		install || die
+
+	dodoc AUTHORS COPYING* ChangeLog HACKING MAINTAINERS
+	dodoc NEWS README
+}
+
+pkg_postinst() {
+	echo ">>> Updating Scrollkeeper database..."
+	scrollkeeper-update >/dev/null 2>&1
+}
+
+pkg_postrm() {
+	echo ">>> Updating Scrollkeeper database..."
+	scrollkeeper-update >/dev/null 2>&1
+}
+
diff --git a/net-mail/evolution/files/digest-evolution-1.2.0-r1 b/net-mail/evolution/files/digest-evolution-1.2.0-r1
new file mode 100644
index 000000000000..ae6db4b9e9b4
--- /dev/null
+++ b/net-mail/evolution/files/digest-evolution-1.2.0-r1
@@ -0,0 +1,2 @@
+MD5 949c31941e869606ab808ce42f3a8e98 evolution-1.2.0.tar.bz2 12129466
+MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/evolution-1.1.90-sharedldap.patch b/net-mail/evolution/files/evolution-1.1.90-sharedldap.patch
new file mode 100644
index 000000000000..6784aa343848
--- /dev/null
+++ b/net-mail/evolution/files/evolution-1.1.90-sharedldap.patch
@@ -0,0 +1,11 @@
+--- evolution-1.1.90/acinclude.m4.orig	2002-09-04 22:28:05.000000000 +0200
++++ evolution-1.1.90/acinclude.m4	2002-11-07 14:03:12.000000000 +0100
+@@ -107,7 +107,7 @@
+ 
+ 		case $with_static_ldap in
+ 		no|"")
+-			if test -f $with_openldap/lib/libldap.la; then
++			if test ! -f $with_openldap/lib/libldap.la; then
+ 				with_static_ldap=yes
+ 			else
+ 				with_static_ldap=no
diff --git a/net-mail/evolution/files/evolution-1.2.0-settingscrash.patch b/net-mail/evolution/files/evolution-1.2.0-settingscrash.patch
new file mode 100644
index 000000000000..7420a5c336fa
--- /dev/null
+++ b/net-mail/evolution/files/evolution-1.2.0-settingscrash.patch
@@ -0,0 +1,18 @@
+RCS file: /cvs/gnome/evolution/mail/mail-composer-prefs.c,v
+diff -u -r1.38 -r1.39
+--- evolution/mail/mail-composer-prefs.c	2002/11/15 17:31:52	1.38
++++ evolution/mail/mail-composer-prefs.c	2002/11/18 17:05:59	1.39
+@@ -746,8 +746,13 @@
+ 	
+ 	CORBA_exception_init (&ev);
+ 	prefs->language_seq = GNOME_Spell_Dictionary_getLanguages (dict, &ev);
++	if (ev._major != CORBA_NO_EXCEPTION)
++		prefs->language_seq = NULL;
+ 	CORBA_exception_free (&ev);
+ 	
++	if (prefs->language_seq == NULL)
++		return FALSE;
++
+ 	gconf_client_add_dir (prefs->gconf, GNOME_SPELL_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
+ 	
+        spell_setup (prefs);