spring cleaning! and bump 1.2.4 to stable x86

21 files changed, 6 insertions, 1414 deletions

diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog
index 25fcb12f7ce9..d059004ca684 100644
--- a/net-mail/evolution/ChangeLog
+++ b/net-mail/evolution/ChangeLog
@@ -1,6 +1,9 @@
 # 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.55 2003/04/23 22:16:47 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.56 2003/04/28 23:46:43 liquidx Exp $
+
+  29 Apr 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.4.ebuild:
+  bumped 1.2.4 to stable for x86
 
 *evolution-1.3.2 (21 Apr 2003)
 
diff --git a/net-mail/evolution/evolution-1.0.8-r2.ebuild b/net-mail/evolution/evolution-1.0.8-r2.ebuild
deleted file mode 100644
index c8fc2d9f2948..000000000000
--- a/net-mail/evolution/evolution-1.0.8-r2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# 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.0.8-r2.ebuild,v 1.7 2003/02/17 22:02:51 foser 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/snapshot/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-RDEPEND="!>=app-text/gnome-spell-0.5
-	!>=gnome-extra/gtkhtml-1.1
-	app-text/scrollkeeper
-	>=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*
-	!>=gnome-extra/gtkhtml-1.1
-	>=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
-	=dev-util/gob-1*
-	doc?	 ( >=app-text/scrollkeeper-0.3.10-r1 )
-	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.20
-	        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
-	# Use DTD compliant scrollkeeper file (from Mandrake/CVS)
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.8-scrollkeeper.patch || die
-	# Patch for the mark read crash bug
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.8-mark-read-crash.patch || 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 ${FILESDIR}/gnome-pilot.m4 ${S}/macros || die
-	fi
-	elibtoolize
-	xml-i18n-toolize --force
-	aclocal -I macros
-	autoconf
-	automake --add-missing
-	
-	(cd libical ; aclocal ; 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() {
-
-	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}
-
-	# 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/evolution-1.2.0-r1.ebuild b/net-mail/evolution/evolution-1.2.0-r1.ebuild
deleted file mode 100644
index 283ee20e4b3b..000000000000
--- a/net-mail/evolution/evolution-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# 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.0-r1.ebuild,v 1.5 2003/02/17 22:02:51 foser 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/snapshot/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-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*
-	>=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/evolution-1.2.1.ebuild b/net-mail/evolution/evolution-1.2.1.ebuild
deleted file mode 100644
index 11ab658b2fc9..000000000000
--- a/net-mail/evolution/evolution-1.2.1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# 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.1.ebuild,v 1.4 2003/02/17 22:02:51 foser Exp $
-
-IUSE="ssl nls mozilla ldap doc spell pda ipv6"
-
-#provide Xmake and Xemake
-
-inherit eutils flag-o-matic gnome.org libtool virtualx
-
-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"
-HOMEPAGE="http://www.ximian.com"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc"
-
-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.22
-	=gnome-base/gconf-1.0*
-	>=gnome-extra/gtkhtml-1.1.7
-	>=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*
-	>=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-subversion.patch
-	epatch ${FILESDIR}/${PN}-1.1.90-sharedldap.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...
-	#
-	# *************************************************************
-
-	# Rather ugly hack to make sure pthread mutex support are not enabled ...
-	cd ${WORKDIR}/${DB3}/dist
-#	cp configure configure.orig
-#	awk '!/MUTEX.*THREADS/ { sub("mut_pthread", "mut_fcntl"); print }' \
-#		configure.orig > configure
-	
-	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
-
-	# 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/evolution-1.2.2.ebuild b/net-mail/evolution/evolution-1.2.2.ebuild
deleted file mode 100644
index 0cfd3db81e98..000000000000
--- a/net-mail/evolution/evolution-1.2.2.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# 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.2.ebuild,v 1.7 2003/03/09 14:58:21 foser Exp $
-
-IUSE="ssl nls mozilla ldap doc spell pda ipv6"
-
-#provide Xmake and Xemake
-
-inherit eutils flag-o-matic gnome.org libtool virtualx
-
-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"
-HOMEPAGE="http://www.ximian.com"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc"
-
-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.22
-	=gnome-base/gconf-1.0*
-	>=gnome-extra/gtkhtml-1.1.7
-	>=gnome-base/oaf-0.6.10
-	>=gnome-base/ORBit-0.5.12
-	<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*
-	>=net-libs/soup-0.7.10
-	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 )
-	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)
-
-# 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-subversion.patch
-	epatch ${FILESDIR}/${PN}-1.1.90-sharedldap.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...
-	#
-	# *************************************************************
-
-	# Rather ugly hack to make sure pthread mutex support are not enabled ...
-	cd ${WORKDIR}/${DB3}/dist
-#	cp configure configure.orig
-#	awk '!/MUTEX.*THREADS/ { sub("mut_pthread", "mut_fcntl"); print }' \
-#		configure.orig > configure
-	
-	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
-
-	# 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
-
-	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/evolution-1.2.4.ebuild b/net-mail/evolution/evolution-1.2.4.ebuild
index 5c8b5629cfc7..5358a1d99369 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.3 2003/04/21 23:27:26 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.2.4.ebuild,v 1.4 2003/04/28 23:46:44 liquidx Exp $
 
 IUSE="ssl nls mozilla ldap doc spell pda ipv6 kerberos kde"
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.ximian.com/pub/ximian-evolution/source/${P}.tar.gz
 HOMEPAGE="http://www.ximian.com"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 RDEPEND="app-text/scrollkeeper
 	>=gnome-extra/bonobo-conf-0.16
diff --git a/net-mail/evolution/evolution-1.3.1.ebuild b/net-mail/evolution/evolution-1.3.1.ebuild
deleted file mode 100644
index 4184c9122fe0..000000000000
--- a/net-mail/evolution/evolution-1.3.1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# 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.1.ebuild,v 1.5 2003/04/07 22:04:28 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"
-HOMEPAGE="http://www.ximian.com"
-
-SLOT="2" # can co-exist with evolution <= 1.2
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-RDEPEND=">=gnome-extra/libgtkhtml-3.0.1
-	>=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-extra/gal-1.99.2
-    >=net-libs/libsoup-1.99.12
-    >=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 )
-	pda?     ( >=gnome-extra/gnome-pilot-2.0.1
-			>=dev-libs/pilot-link-0.11.7
-            >=gnome-extra/gnome-pilot-conduits-2.0.1 )
-    kerberos? ( >=app-crypt/krb5-1.2.5 )
-	spell?   ( >=app-text/gnome-spell-1.0.1 )"
-
-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.1.html"
-}
-
-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() {
-
-	# omf docs missing in evo-1.3.1
-	#cd omf-install
-	#cp Makefile Makefile.old
-	#sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
-	#rm Makefile.old
-    
-    # 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}
-
-	# 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
-	
-	# remove kde applnk if -kde
-	if [ -z "`use kde`" ]; then
-		rm -rf ${D}/usr/share/applnk
-	fi
-	
-	dodoc AUTHORS COPYING* ChangeLog HACKING MAINTAINERS
-	dodoc NEWS README
-}
-
-# evo-1.3.1 doesn't seem to have any OMFs
-SCROLLKEEPER_UPDATE="0"
diff --git a/net-mail/evolution/files/digest-evolution-1.0.8-r2 b/net-mail/evolution/files/digest-evolution-1.0.8-r2
deleted file mode 100644
index a0cb8c572d95..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.0.8-r2
+++ /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.2.0-r1 b/net-mail/evolution/files/digest-evolution-1.2.0-r1
deleted file mode 100644
index ae6db4b9e9b4..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.2.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-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/digest-evolution-1.2.1 b/net-mail/evolution/files/digest-evolution-1.2.1
deleted file mode 100644
index 545f4b73f891..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.2.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 51ce3295f280c6533ecbcd9df45c6691 evolution-1.2.1.tar.bz2 12218363
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.2.2 b/net-mail/evolution/files/digest-evolution-1.2.2
deleted file mode 100644
index b65f27a6564c..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.2.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 69805b56b0c6e44de26e9542554f4da3 evolution-1.2.2.tar.bz2 12459844
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.3.1 b/net-mail/evolution/files/digest-evolution-1.3.1
deleted file mode 100644
index 8942dbbfb93f..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-MD5 dc3bc6e2c133bb380f48f50f4918052e /files/evolution-1.0.2-conduit.patch 308
-MD5 76b7ec4d297cc9e14fd0c348c8449b75 /files/evolution-1.0.2-imapfix.diff 2838
-MD5 53050cb008a2555b215f7401772cfede /files/evolution-1.0.2-kde.patch 656
-MD5 d6c7be2ddd045fb5d487416bd09f1c1b /files/evolution-1.0.3-filter-crash.patch 1202
-MD5 1a2892e6ac519f18f30f5e2aa6508174 /files/evolution-1.0.8-mark-read-crash.patch 2018
-MD5 ecec58337e9c9f9ffb1013c4860fd33c /files/evolution-1.0.8-scrollkeeper.patch 1492
-MD5 c837abd50d990dea46fcea32b8a1b001 /files/evolution-1.1.90-kde.patch 689
-MD5 d2dcad91e6ec97286468eb7d13ceac9b /files/evolution-1.1.90-scrollkeeper.patch 1365
-MD5 8909b7f2d3483d55036f21ca2780e4a3 /files/evolution-1.1.90-sharedldap.patch 370
-MD5 f44bc5e363c1f976a7a72676886b9d13 /files/evolution-1.1.90-subversion.patch 470
-MD5 63d02821e6de8e0129d954d406dc77ae /files/evolution-1.1.90-utf8.patch 726
-MD5 2526fb78fe27dc17b78566860285bff1 /files/evolution-1.2.0-settingscrash.patch 625
-MD5 980771bb5349699c8d8ecd6b6f035b50 /files/gnome-pilot.m4 6452
-MD5 d91fe221d7054c762f1b0503aa91478b /evolution-1.3.1.ebuild 6142
-MD5 1189b8bda003fcdd42bff37bceba6645 evolution-1.3.1.tar.bz2 11122481
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/evolution-1.0.2-conduit.patch b/net-mail/evolution/files/evolution-1.0.2-conduit.patch
deleted file mode 100644
index e235bdfc84b8..000000000000
--- a/net-mail/evolution/files/evolution-1.0.2-conduit.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- evolution-1.0.2/shell/e-shell-view-menu.c.orig	Wed Dec  5 00:03:11 2001
-+++ evolution-1.0.2/shell/e-shell-view-menu.c	Tue Feb 26 15:08:43 2002
-@@ -567,6 +567,7 @@
- {
-         char *args[] = {
-                 "gpilotd-control-applet",
-+		"--cap-id=1",
-                 NULL
-         };
-         int pid;
diff --git a/net-mail/evolution/files/evolution-1.0.2-imapfix.diff b/net-mail/evolution/files/evolution-1.0.2-imapfix.diff
deleted file mode 100644
index 827466a32d4b..000000000000
--- a/net-mail/evolution/files/evolution-1.0.2-imapfix.diff
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -urN evolution-1.0.2/camel/providers/imap/camel-imap-command.c evolution-1.0.2+imapfix/camel/providers/imap/camel-imap-command.c
---- evolution-1.0.2/camel/providers/imap/camel-imap-command.c	Thu Jan 24 10:56:50 2002
-+++ evolution-1.0.2+imapfix/camel/providers/imap/camel-imap-command.c	Thu Feb 28 01:18:36 2002
-@@ -687,10 +687,17 @@
- 					arglen += strlen (store->namespace) + 1;
- 			}
- 			g_ptr_array_add (args, string);
--			if (store->capabilities & IMAP_CAPABILITY_LITERALPLUS)
--				len += arglen + 15;
-+			if (imap_needs_quoting(string))
-+			{
-+				if (store->capabilities & IMAP_CAPABILITY_LITERALPLUS)
-+					len += arglen + 15;
-+				else
-+					len += arglen * 2;
-+			}
- 			else
--				len += arglen * 2;
-+			{
-+				len += arglen;
-+			}
- 			start = p + 1;
- 			break;
- 			
-@@ -736,14 +743,21 @@
- 			string = args->pdata[i++];
- 			if (*p == 'F')
- 				string = imap_namespace_concat (store, string);
--			if (store->capabilities & IMAP_CAPABILITY_LITERALPLUS) {
--				op += sprintf (op, "{%d+}\r\n%s",
--					       strlen (string), string);
--			} else {
--				char *quoted = imap_quote_string (string);
--				
--				op += sprintf (op, "%s", quoted);
--				g_free (quoted);
-+			if (imap_needs_quoting(string))
-+			{
-+				if (store->capabilities & IMAP_CAPABILITY_LITERALPLUS) {
-+					op += sprintf (op, "{%d+}\r\n%s",
-+						       strlen (string), string);
-+				} else {
-+					char *quoted = imap_quote_string (string);
-+
-+					op += sprintf (op, "%s", quoted);
-+					g_free (quoted);
-+				}
-+			}
-+			else
-+			{
-+				op += sprintf(op, "%s", string);
- 			}
- 			if (*p == 'F')
- 				g_free (string);
-diff -urN evolution-1.0.2/camel/providers/imap/camel-imap-utils.c evolution-1.0.2+imapfix/camel/providers/imap/camel-imap-utils.c
---- evolution-1.0.2/camel/providers/imap/camel-imap-utils.c	Tue Dec  4 14:20:09 2001
-+++ evolution-1.0.2+imapfix/camel/providers/imap/camel-imap-utils.c	Thu Feb 28 01:18:36 2002
-@@ -270,6 +270,21 @@
- };
- #define imap_is_atom_char(ch) (isprint (ch) && !imap_atom_specials[ch])
- 
-+gboolean
-+imap_needs_quoting(const char *in)
-+{
-+	size_t i, len=strlen(in);
-+	if (len == 0)
-+	    return TRUE;
-+	for (i=0; i<len; i++)
-+	{
-+		if (!imap_is_atom_char(in[i]))
-+			return TRUE;
-+	}
-+	return FALSE;
-+}
-+
-+
- /**
-  * imap_parse_string_generic:
-  * @str_p: a pointer to a string
-diff -urN evolution-1.0.2/camel/providers/imap/camel-imap-utils.h evolution-1.0.2+imapfix/camel/providers/imap/camel-imap-utils.h
---- evolution-1.0.2/camel/providers/imap/camel-imap-utils.h	Sat Oct 27 14:06:04 2001
-+++ evolution-1.0.2+imapfix/camel/providers/imap/camel-imap-utils.h	Wed Feb 27 23:38:04 2002
-@@ -49,6 +49,7 @@
- 
- enum { IMAP_STRING, IMAP_NSTRING, IMAP_ASTRING };
- 
-+gboolean imap_needs_quoting (const char *in);
- char    *imap_parse_string_generic (char **str_p, int *len, int type);
- 
- #define imap_parse_string(str_p, len_p) \
diff --git a/net-mail/evolution/files/evolution-1.0.2-kde.patch b/net-mail/evolution/files/evolution-1.0.2-kde.patch
deleted file mode 100644
index 286f6687275a..000000000000
--- a/net-mail/evolution/files/evolution-1.0.2-kde.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- evolution-1.0.2/configure.in.orig	Mon Feb 25 18:26:05 2002
-+++ evolution-1.0.2/configure.in	Mon Feb 25 19:01:52 2002
-@@ -990,14 +990,9 @@
- if test -z "$with_kde_applnk_path"; then
- 	with_kde_applnk_path="$prefix/share/applnk"
- fi
--if test -d "$with_kde_applnk_path" ; then
--	AC_MSG_RESULT("$with_kde_applnk_path" found)
--	AC_DEFINE(HAVE_KDE_APPLNK)
--	KDE_APPLNK_DIR="$with_kde_applnk_path"
--else
--	AC_MSG_RESULT(not found)
--	KDE_APPLNK_DIR=""
--fi
-+AC_MSG_RESULT("$with_kde_applnk_path" found)
-+AC_DEFINE(HAVE_KDE_APPLNK)
-+KDE_APPLNK_DIR="$with_kde_applnk_path"
- AM_CONDITIONAL(HAVE_KDE_APPLNK, test x"$KDE_APPLNK_DIR" != x)
- AC_SUBST(KDE_APPLNK_DIR)
- 
diff --git a/net-mail/evolution/files/evolution-1.0.3-filter-crash.patch b/net-mail/evolution/files/evolution-1.0.3-filter-crash.patch
deleted file mode 100644
index 91bfa261c03a..000000000000
--- a/net-mail/evolution/files/evolution-1.0.3-filter-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# First hunk by Mikael Hallendal, fixing the crash in the ADD code.
-# Second and third hunk by Martin Schlemmer, fixing the crash in the EDIT code.
-
---- filter/rule-editor.c.orig	Tue Dec  4 21:20:09 2001
-+++ filter/rule-editor.c	Tue Apr  2 00:49:27 2002
-@@ -253,7 +253,9 @@
- 	default:
- 		gnome_dialog_close (GNOME_DIALOG (dialog));
- 	case -1:
-+	  if (re->edit) {
- 		gtk_object_unref (GTK_OBJECT (re->edit));
-+	  }
- 		re->edit = NULL;
- 		
- 		re->dialog = NULL;
-@@ -327,7 +329,9 @@
- 	default:
- 		gnome_dialog_close (GNOME_DIALOG (dialog));
- 	case -1:
-+	  if (re->edit) {
- 		gtk_object_unref (GTK_OBJECT (re->edit));
-+	  }
- 		re->edit = NULL;
- 		
- 		re->dialog = NULL;
-@@ -361,7 +365,7 @@
- 	
- 	gtk_window_set_default_size (GTK_WINDOW (re->dialog), 600, 400);
- 	gtk_window_set_policy (GTK_WINDOW (re->dialog), FALSE, TRUE, FALSE);
--	gtk_widget_set_parent (re->dialog, GTK_WIDGET (re));
-+	gtk_widget_set_parent_window (re->dialog, GTK_WIDGET (re));
- 	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (re->dialog)->vbox), rules, TRUE, TRUE, 0);
- 	gtk_signal_connect (GTK_OBJECT (re->dialog), "clicked", edit_editor_clicked, re);
- 	gtk_signal_connect (GTK_OBJECT (re->dialog), "destroy", edit_editor_destroyed, re);
diff --git a/net-mail/evolution/files/evolution-1.0.8-mark-read-crash.patch b/net-mail/evolution/files/evolution-1.0.8-mark-read-crash.patch
deleted file mode 100644
index a3746bb4a4ce..000000000000
--- a/net-mail/evolution/files/evolution-1.0.8-mark-read-crash.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- evolution-1.0.8/mail/folder-browser.c.stackcorrupt	Mon Sep  2 15:30:46 2002
-+++ evolution-1.0.8/mail/folder-browser.c	Mon Sep  2 15:31:04 2002
-@@ -1341,6 +1341,30 @@
- 	message_list_hide_add(ml, "(match-all (system-flag \"seen\"))", ML_HIDE_SAME, ML_HIDE_SAME);
- }
- 
-+static void
-+mark_as_seen_cb (GtkWidget *widget, FolderBrowser *fb)
-+{
-+	mark_as_seen (NULL, fb, NULL);
-+}
-+
-+static void
-+mark_as_unseen_cb (GtkWidget *widget, FolderBrowser *fb)
-+{
-+	mark_as_unseen (NULL, fb, NULL);
-+}
-+
-+static void
-+mark_as_important_cb (GtkWidget *widget, FolderBrowser *fb)
-+{
-+	mark_as_important (NULL, fb, NULL);
-+}
-+
-+static void
-+mark_as_unimportant_cb (GtkWidget *widget, FolderBrowser *fb)
-+{
-+	mark_as_unimportant (NULL, fb, NULL);
-+}
-+
- /* dum de dum, about the 3rd copy of this function throughout the mailer/camel */
- static const char *
- strip_re(const char *subject)
-@@ -1456,10 +1480,10 @@
- 	{ N_("Reply to _All"),              NULL, GTK_SIGNAL_FUNC (reply_to_all),     NULL,  0 },
- 	{ N_("_Forward"),                   NULL, GTK_SIGNAL_FUNC (forward),          NULL,  0 },
- 	{ "", NULL, (NULL), NULL,  0 },
--	{ N_("Mar_k as Read"),              NULL, GTK_SIGNAL_FUNC (mark_as_seen),     NULL,  CAN_MARK_READ },
--	{ N_("Mark as U_nread"),            NULL, GTK_SIGNAL_FUNC (mark_as_unseen),   NULL,  CAN_MARK_UNREAD },
--	{ N_("Mark as _Important"),         NULL, GTK_SIGNAL_FUNC (mark_as_important), NULL, CAN_MARK_IMPORTANT },
--	{ N_("Mark as Unim_portant"),       NULL, GTK_SIGNAL_FUNC (mark_as_unimportant), NULL, CAN_MARK_UNIMPORTANT },
-+	{ N_("Mar_k as Read"),              NULL, GTK_SIGNAL_FUNC (mark_as_seen_cb),     NULL,  CAN_MARK_READ },
-+	{ N_("Mark as U_nread"),            NULL, GTK_SIGNAL_FUNC (mark_as_unseen_cb),   NULL,  CAN_MARK_UNREAD },
-+	{ N_("Mark as _Important"),         NULL, GTK_SIGNAL_FUNC (mark_as_important_cb), NULL, CAN_MARK_IMPORTANT },
-+	{ N_("Mark as Unim_portant"),       NULL, GTK_SIGNAL_FUNC (mark_as_unimportant_cb), NULL, CAN_MARK_UNIMPORTANT },
- 	
- 	E_POPUP_SEPARATOR,
- 	
diff --git a/net-mail/evolution/files/evolution-1.0.8-scrollkeeper.patch b/net-mail/evolution/files/evolution-1.0.8-scrollkeeper.patch
deleted file mode 100644
index aa61ea3cb1d7..000000000000
--- a/net-mail/evolution/files/evolution-1.0.8-scrollkeeper.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- evolution-1.0.8/help/C/evolution-C.omf.scrollkeeper	2002-03-25 22:40:14.000000000 +0100
-+++ evolution-1.0.8/help/C/evolution-C.omf	2002-06-28 16:37:02.000000000 +0200
-@@ -1,14 +1,17 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" encoding="ISO-8859-1" standalone="no" ?>
- <omf>
-   <resource>
-+   <creator>
-+     Ximian, Inc.
-+   </creator>
-     <title>
-       Evolution Manual
-     </title>
--    <subject>
--      <category>GNOME|Applications</category>
--    </subject>
-+    <date>2002</date>
-+    <subject category="GNOME|Applications"/>
-     <format mime="text/html"/>
-     <identifier url="index.html"/>
-     <language code="C"/>
-+    <relation seriesid="6a2207d8-8aa4-11d6-8cb4-f0bb5a765891"/>
-   </resource>
- </omf>
---- evolution-1.0.8/help/no/evolution-no.omf.scrollkeeper	2001-12-05 11:26:54.000000000 +0100
-+++ evolution-1.0.8/help/no/evolution-no.omf	2002-06-28 16:38:13.000000000 +0200
-@@ -1,14 +1,17 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" encoding="ISO-8859-1" standalone="no" ?>
- <omf>
-   <resource>
-+   <creator>
-+     Ximian, Inc.
-+   </creator>
-     <title>
-       Evolution brukerhåndbok
-     </title>
--    <subject>
--      <category>GNOME|Applikasjoner</category>
--    </subject>
-+    <date>2002</date>
-+    <subject category="GNOME|Applikasjoner"/>
-     <format mime="text/sgml"/>
-     <identifier url="index.html"/>
-     <language code="no"/>
-+    <relation seriesid="6a2207d8-8aa4-11d6-8cb4-f0bb5a765891"/>
-   </resource>
- </omf>
diff --git a/net-mail/evolution/files/evolution-1.1.90-scrollkeeper.patch b/net-mail/evolution/files/evolution-1.1.90-scrollkeeper.patch
deleted file mode 100644
index 18b153bcf4e8..000000000000
--- a/net-mail/evolution/files/evolution-1.1.90-scrollkeeper.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- evolution-1.1.90/help/C/evolution-C.omf.scrollkeeper	2002-09-24 19:45:25.000000000 +0200
-+++ evolution-1.1.90/help/C/evolution-C.omf	2002-11-07 13:31:58.000000000 +0100
-@@ -1,4 +1,5 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
-   <resource>
-    <creator>
-@@ -12,5 +13,6 @@
-     <format mime="text/html"/>
-     <identifier url="index.html"/>
-     <language code="C"/>
-+    <relation seriesid="6a2207d8-8aa4-11d6-8cb4-f0bb5a765891"/>
-   </resource>
- </omf>
---- evolution-1.1.90/help/no/evolution-no.omf.scrollkeeper	2002-09-24 19:45:27.000000000 +0200
-+++ evolution-1.1.90/help/no/evolution-no.omf	2002-11-07 13:33:03.000000000 +0100
-@@ -1,4 +1,5 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
-   <resource>
-    <creator>
-@@ -12,5 +13,6 @@
-     <format mime="text/sgml"/>
-     <identifier url="index.html"/>
-     <language code="no"/>
-+    <relation seriesid="6a2207d8-8aa4-11d6-8cb4-f0bb5a765891"/>
-   </resource>
- </omf>
diff --git a/net-mail/evolution/files/evolution-1.1.90-utf8.patch b/net-mail/evolution/files/evolution-1.1.90-utf8.patch
deleted file mode 100644
index a347d0fd1555..000000000000
--- a/net-mail/evolution/files/evolution-1.1.90-utf8.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- evolution-1.1.90/shell/e-shell-settings-dialog.c.orig	2002-10-26 08:47:09.000000000 +0200
-+++ evolution-1.1.90/shell/e-shell-settings-dialog.c	2002-11-07 15:24:49.000000000 +0100
-@@ -32,6 +32,7 @@
- #include "e-util/e-lang-utils.h"
- 
- #include <gal/util/e-util.h>
-+#include <gal/util/e-unicode-i18n.h>
- 
- #include <bonobo/bonobo-widget.h>
- #include <bonobo/bonobo-exception.h>
-@@ -93,8 +94,8 @@
- 		gdk_pixbuf_ref (icon);
- 
- 	page = g_new (Page, 1);
--	page->title       = g_strdup (_(title));
--	page->description = g_strdup (_(description));
-+	page->title       = g_strdup (U_(title));
-+	page->description = g_strdup (U_(description));
- 	page->icon        = icon;
- 	page->type        = type;
- 	page->priority    = priority;
diff --git a/net-mail/evolution/files/evolution-1.2.0-settingscrash.patch b/net-mail/evolution/files/evolution-1.2.0-settingscrash.patch
deleted file mode 100644
index 7420a5c336fa..000000000000
--- a/net-mail/evolution/files/evolution-1.2.0-settingscrash.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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);