RC1

6 files changed, 24 insertions, 231 deletions

diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog
index 79b964f2ce1c..4c58c6243cbb 100644
--- a/net-mail/evolution/ChangeLog
+++ b/net-mail/evolution/ChangeLog
@@ -1,6 +1,11 @@
 # 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.26 2002/10/20 15:13:06 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.27 2002/11/09 12:58:31 azarah Exp $
+
+*evolution-1.1.90 (9 Nov 2002)
+
+  9 Nov 2002; Martin Schlemmer <azarah@gentoo.org> evolution-1.1.90.ebuild :
+  Added RC1.
 
 *evolution-1.0.8-r2 (16 Oct 2002)
 
diff --git a/net-mail/evolution/evolution-1.0.8.ebuild b/net-mail/evolution/evolution-1.0.8.ebuild
deleted file mode 100644
index 67dc2c5d54e1..000000000000
--- a/net-mail/evolution/evolution-1.0.8.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# 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.0.8.ebuild,v 1.4 2002/10/05 05:39:22 drobbins Exp $
-
-IUSE="ssl nls mozilla ldap doc spell pda"
-
-#provide Xmake and Xemake
-
-inherit virtualx libtool
-
-DB3=db-3.1.17
-S=${WORKDIR}/${P}
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-	ftp://ftp.ximian.com/pub/source/${PN}/${P}.tar.gz
-	http://people.codefactory.se/~micke/${PN}/${P}.tar.gz
-	http://www.sleepycat.com/update/3.1.17/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
-
-RDEPEND=">=gnome-extra/bonobo-conf-0.14
-	>=gnome-base/bonobo-1.0.18
-	>=gnome-extra/gal-0.19.2
-	=gnome-base/gconf-1.0*
-	>=gnome-extra/gtkhtml-1.0.2-r2
-	>=gnome-base/oaf-0.6.7
-	>=gnome-base/ORBit-0.5.12
-	( >=gnome-base/libglade-0.17-r1
-	 <gnome-base/libglade-2.0 )		
-	>=media-libs/gdk-pixbuf-0.14.0
-	>=dev-libs/libxml-1.8.16
-	=gnome-base/gnome-vfs-1.0*		
-	>=gnome-base/gnome-print-0.34
-	>=app-text/scrollkeeper-0.3.10-r1
-	>=dev-util/gob-1.0.12
-	ssl?     ( >=net-www/mozilla-0.9.9 )
-	ldap?    ( >=net-nds/openldap-2.0 )
-	mozilla? ( >=net-www/mozilla-0.9.9 )
-	pda?     ( >=gnome-extra/gnome-pilot-0.1.61-r2 )
-	spell?   ( >=app-text/gnome-spell-0.4.1-r2 )"
-
-# 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.11
-	        sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	# Fix the filter crash.  This is actually a problem in the add and
-	# edit code.  Mikael Hallendal originally fixed the bug in the add
-	# code.  I added the fixes for the edit code.
-	#
-	# Martin Schlemmer (02 April 2002)
-	patch -p0 < ${FILESDIR}/evolution-1.0.3-filter-crash.patch || die
-	# add mandrake patches
-	# fix KDE detection
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-kde.patch || die
-	# call pilot conduit applet (not pilot link applet)
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-conduit.patch || die
-	# Patch from Preston A. Elder to resolve bug #1355
-	# fix a problem with literal strings and sertain IMAP servers
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-imapfix.diff || die
-
-	# lobtoolize 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}
-	if [ ! -f ${S}/macros/gnome-pilot.m4 ]
-	then
-		cp -f ${FILESDIR}/gnome-pilot.m4 ${S}/macros || die
-	fi
-	elibtoolize
-	aclocal -I macros
-	automake --add-missing
-	autoconf
-}
-
-src_compile() {
-
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-
-	make || die
-	make prefix=${WORKDIR}/db3 install || die
-
-	cd ${S}
-  
-	local myconf=""
-
-	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"
-	else
-		myconf="${myconf} --with-openldap=no"
-	fi
-
-	if [ -n "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-			        --with-nspr-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes"
-	fi
-
-	if [ -n "`use ssl`" ] ; then
-		myconf="${myconf} --with-nss-includes=${MOZILLA}/include/nss   \
-				--with-nss-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nss-libs --without-nss-includes"
-	fi
-
-	# SSL needs NSPR libs  ...
-	if [ -n "`use ssl`" ] && [ -z "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-				--with-nspr-libs=${MOZILLA}"
-	fi
-
-	if [ -n "`use doc`" ] ; then
-		myconf="${myconf} --enable-gtk-doc"
-	else
-		myconf="${myconf} --disable-gtk-doc"
-	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}
-
-	# Don't use DESTDIR it violates sandbox // Hallski
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		KDE_APPLNK_DIR=${D}/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/evolution-1.0.8-r1.ebuild b/net-mail/evolution/evolution-1.1.90.ebuild
index abda748e6ca7..5ce0a1952b70 100644
--- a/net-mail/evolution/evolution-1.0.8-r1.ebuild
+++ b/net-mail/evolution/evolution-1.1.90.ebuild
@@ -1,31 +1,30 @@
 # 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.0.8-r1.ebuild,v 1.7 2002/10/05 05:39:22 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.1.90.ebuild,v 1.1 2002/11/09 12:58:31 azarah Exp $
 
 IUSE="ssl nls mozilla ldap doc spell pda"
 
 #provide Xmake and Xemake
 
-inherit virtualx libtool
+inherit gnome.org virtualx libtool
 
-DB3=db-3.1.17
-S=${WORKDIR}/${P}
+DB3="db-3.1.17"
+S="${WORKDIR}/${P}"
 DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-	ftp://ftp.ximian.com/pub/source/${PN}/${P}.tar.gz
-	http://people.codefactory.se/~micke/${PN}/${P}.tar.gz
+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"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
 
 RDEPEND="app-text/scrollkeeper
-	>=gnome-extra/bonobo-conf-0.14
-	>=gnome-base/bonobo-1.0.18
-	>=gnome-extra/gal-0.19.2
+	>=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.0.2-r2
+	>=gnome-extra/gtkhtml-1.1.4
 	>=gnome-base/oaf-0.6.7
 	>=gnome-base/ORBit-0.5.12
 	( >=gnome-base/libglade-0.17-r1
@@ -35,6 +34,7 @@ RDEPEND="app-text/scrollkeeper
 	=gnome-base/gnome-vfs-1.0*		
 	>=gnome-base/gnome-print-0.34
 	>=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 )
 	ldap?    ( >=net-nds/openldap-2.0 )
@@ -53,39 +53,17 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	
-	cd ${S}
-	# Fix the filter crash.  This is actually a problem in the add and
-	# edit code.  Mikael Hallendal originally fixed the bug in the add
-	# code.  I added the fixes for the edit code.
-	#
-	# Martin Schlemmer (02 April 2002)
-	patch -p0 < ${FILESDIR}/evolution-1.0.3-filter-crash.patch || die
-	# add mandrake patches
-	# fix KDE detection
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-kde.patch || die
-	# call pilot conduit applet (not pilot link applet)
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-conduit.patch || die
-	# Patch from Preston A. Elder to resolve bug #1355
-	# fix a problem with literal strings and sertain IMAP servers
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-imapfix.diff || die
-	# Use DTD compliant scrollkeeper file (from Mandrake/CVS)
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.8-scrollkeeper.patch || die
-
-	# lobtoolize to fix not all libs installing, and buggy .la files.
+	# 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}
-	if [ ! -f ${S}/macros/gnome-pilot.m4 ]
-	then
-		cp ${FILESDIR}/gnome-pilot.m4 ${S}/macros || die
-	fi
 	elibtoolize
 	xml-i18n-toolize --force
-	aclocal -I macros
+	aclocal -I macros -I /usr/share/aclocal/gnome-macros
 	autoconf
 	automake --add-missing
 	
-	(cd libical ; aclocal ; autoconf)
+	(cd libical ; aclocal -I /usr/share/aclocal/gnome-macros ; autoconf)
 
 	# Fix sandbox errors
 	cd ${S}/default_user
@@ -105,8 +83,7 @@ src_compile() {
 	cd ${S}
   
 	local myconf=""
-
-	MOZILLA=$MOZILLA_FIVE_HOME
+	local MOZILLA="${MOZILLA_FIVE_HOME}"
 
 	if [ -n "`use pda`" ] ; then
 		myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes"
diff --git a/net-mail/evolution/files/digest-evolution-1.0.8 b/net-mail/evolution/files/digest-evolution-1.0.8
deleted file mode 100644
index a0cb8c572d95..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.0.8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 024e62b7cd37315d40b16d76b072e59d evolution-1.0.8.tar.gz 13929927
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.0.8-r1 b/net-mail/evolution/files/digest-evolution-1.0.8-r1
deleted file mode 100644
index a0cb8c572d95..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.0.8-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 024e62b7cd37315d40b16d76b072e59d evolution-1.0.8.tar.gz 13929927
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.1.90 b/net-mail/evolution/files/digest-evolution-1.1.90
new file mode 100644
index 000000000000..6581330e1d22
--- /dev/null
+++ b/net-mail/evolution/files/digest-evolution-1.1.90
@@ -0,0 +1,2 @@
+MD5 9a5c5ffc1d2bc23c9753b5c44d5038be evolution-1.1.90.tar.bz2 12151318
+MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117