bugs bugs crawling on my rug

(Portage version: 2.0.51.19)

24 files changed, 26 insertions, 1265 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 90de6a9c362f..88867638b871 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.69 2005/05/18 20:19:07 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.70 2005/06/06 13:47:35 foser Exp $
+
+  06 Jun 2005; Marinus Schraal <foser@gentoo.org> evolution-2.*.ebuild :
+  Add workaround for #92920
 
   18 May 2005; Fernando J. Pereda <ferdy@gentoo.org> evolution-2.0.4.ebuild:
   alpha stable
diff --git a/mail-client/evolution/evolution-1.4.6.ebuild b/mail-client/evolution/evolution-1.4.6.ebuild
deleted file mode 100644
index 15aad77ddf78..000000000000
--- a/mail-client/evolution/evolution-1.4.6.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.4.6.ebuild,v 1.19 2005/03/23 16:17:35 seemant Exp $
-
-inherit flag-o-matic virtualx gnome2 eutils alternatives
-
-# problems with -O3 on gcc-3.3.1
-replace-flags -O3 -O2
-
-DB3="db-3.1.17"
-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"
-
-IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos crypt"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc hppa alpha amd64 ia64"
-
-# Top stanza are ximian deps
-RDEPEND="=gnome-extra/libgtkhtml-3.0.10*
-	=gnome-extra/gal-1.99.11*
-	=net-libs/libsoup-1.99.28*
-	>=gnome-extra/yelp-2.2
-	pda? ( >=app-pda/gnome-pilot-2.0.10-r1
-	       >=app-pda/pilot-link-0.11.8
-	       >=app-pda/gnome-pilot-conduits-2.0.10-r1 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	>=gnome-base/orbit-2.8.2
-	>=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
-	>=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
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( mozilla? ( || ( ( >=dev-libs/nspr-4.3 >=dev-libs/nss-3.8 )
-	                       www-client/mozilla
-	                     )
-	                ) )
-	ssl? ( !mozilla? ( >=dev-libs/openssl-0.9.5 ) )
-	ldap? ( >=net-nds/openldap-2.0 )
-	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
-	doc? ( >=app-text/scrollkeeper-0.3.10-r1 )
-	!gnome-extra/evolution-data-server"
-# libebook conflicts with eds and evolution 1.4 links against
-# it incorrectly, see bug #72487 <obz@gentoo.org>
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig
-	>=sys-devel/libtool-1.4.1-r1
-	>=dev-util/intltool-0.20
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )"
-
-pkg_setup() {
-	if [ -x ${ROOT}/usr/bin/evolution-1.3 ]; then
-		eerror "Please un-merge the 1.3 Development Versions of Ximian Evolution."
-		eerror "You can do this by doing:"
-		eerror ""
-		eerror "   emerge -C \"=mail-client/evolution-1.3*\""
-		eerror ""
-		die "unmerge evolution-1.3 before installing evolution-1.4"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Remove dependency on libdb1.so (its deprecated)
-	cd ${S}; sed -i -e "s/-ldb1//" configure
-
-	# We need the omf fix, or else we get access violation
-	# errors related to sandbox
-	gnome2_omf_fix ${S}/help/C/Makefile.in
-
-	# Patch for 64-bit ... should be retired for 1.5 which contains
-	# the patch upstream
-	#epatch ${FILESDIR}/evolution-1.4.4-alpha.patch
-
-	epatch ${FILESDIR}/evolution-gcc34.patch
-}
-
-##### Compile evolution specific db3 for static linking #####
-src_compile_db3() {
-	einfo "Compiling DB3..."
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-
-	# Rather ugly hack to make sure pthread mutex support are not enabled ...
-	if [ -n "`egrep "^LIBS=[[:space:]]*-lpthread" Makefile`" ];  then
-		append-flags "-pthread"
-	fi
-
-	make || die "db make failed"
-	make prefix=${WORKDIR}/db3 install || die "db install failed"
-
-}
-
-src_compile() {
-	elibtoolize
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	# Compile evo specific version of db3
-	src_compile_db3
-
-	einfo "Compiling Evolution..."
-	cd ${S}
-
-	local myconf=
-
-	use pda \
-		&& myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes" \
-		|| myconf="${myconf} --enable-pilot-conduits=no"
-
-	use ldap \
-		&&	myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
-		|| myconf="${myconf} --with-openldap=no"
-
-	( use kerberos && ! use amd64 ) \
-		&& myconf="${myconf} --with-krb5=/usr" \
-		|| myconf="${myconf} --without-krb5"
-
-	use doc \
-		&& myconf="${myconf} --enable-gtk-doc" \
-		|| myconf="${myconf} --disable-gtk-doc"
-
-	use ipv6 \
-		&& myconf="${myconf} --enable-ipv6=yes" \
-		|| myconf="${myconf} --enable-ipv6=no"
-
-	# KDE 3.2 does not need applnk anymore
-	myconf="${myconf} --with-kde-applnk-path=no"
-
-	use amd64 && myconf="${myconf} --with-pic"
-
-	# Use Mozilla NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
-	if use ssl && use mozilla; then
-		if has_version "dev-libs/nspr"; then
-			NSS_LIB=/usr/lib/nss
-			NSPR_LIB=/usr/lib/nspr
-			NSS_INC=/usr/include/nss
-			NSPR_INC=/usr/include/nspr
-		elif has_version "www-client/mozilla"; then
-			NSS_LIB=/usr/lib/mozilla
-			NSPR_LIB=/usr/lib/mozilla
-			NSS_INC=/usr/lib/mozilla/include/nss
-			NSPR_INC=/usr/lib/mozilla/include/nspr
-		else
-			eerror "Neither www-client/mozilla nor dev-libs/nspr found."
-			die "unexpected error. unable to find nss/nspr"
-		fi
-
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${NSPR_INC} \
-			--with-nspr-libs=${NSPR_LIB} \
-			--with-nss-includes=${NSS_INC} \
-			--with-nss-libs=${NSS_LIB}"
-	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 use ssl && ! use mozilla; then
-		myconf="${myconf} --enable-openssl=yes"
-	fi
-
-	econf --with-db3=${WORKDIR}/db3 ${myconf} || die
-
-	# Needs to be able to connect to X display to build.
-	Xemake || Xmake || die "make failed"
-}
-
-pkg_postinst() {
-	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
-	gnome2_pkg_postinst
-	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'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-}
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
diff --git a/mail-client/evolution/evolution-2.0.2-r1.ebuild b/mail-client/evolution/evolution-2.0.2-r1.ebuild
deleted file mode 100644
index 067452606c57..000000000000
--- a/mail-client/evolution/evolution-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.2-r1.ebuild,v 1.8 2005/03/23 16:17:35 seemant Exp $
-
-inherit eutils gnome2 flag-o-matic alternatives
-
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-HOMEPAGE="http://ximian.com/products/evolution/"
-
-LICENSE="GPL-2"
-SLOT="2.0"
-KEYWORDS="x86 amd64 ppc sparc hppa ia64 ~mips alpha"
-IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda"
-
-# Top stanza are ximian deps
-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
-	>=gnome-extra/yelp-2.5.1
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/libgnomecanvas-2.0
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2
-	>=gnome-base/libgnomeprintui-2
-	>=x11-themes/gnome-icon-theme-1.2
-	>=gnome-base/orbit-2.9.8
-	mail-filter/spamassassin
-	pda? ( >=app-pda/gnome-pilot-2.0.10
-		>=app-pda/gnome-pilot-conduits-2.0.10 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( mozilla? ( www-client/mozilla )
-		!mozilla? ( >=dev-libs/nspr-4.4.1
-			>=dev-libs/nss-3.9.2 ) )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig
-	>=sys-devel/libtool-1.4.1-r1
-	>=dev-util/intltool-0.30
-	sys-devel/gettext
-	sys-devel/bison
-	>=app-text/scrollkeeper-0.3.10-r1
-	doc? ( dev-util/gtk-doc )"
-
-G2CONF="--disable-default-binary \
-	$(use_enable ssl nss) \
-	$(use_enable ssl smime) \
-	$(use_enable ipv6) \
-	$(use_enable nntp) \
-	$(use_enable pda pilot-conduits)"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
-ELTCONF="--reverse-deps"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# bug #66166 -- temporary workaround until new baselayout exists
-	epatch ${FILESDIR}/${P}-gentoo_etc_services.patch
-	# bug #67824 -- fix typo of USE -ipv6
-	epatch ${FILESDIR}/${P}-camel_typo.patch
-	# bug #79183 -- security vuln in camel
-	epatch ${FILESDIR}/${PN}-2-CAN-2005-0102.patch
-}
-
-src_compile() {
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	cd ${S}
-	local myconf=""
-
-	use ldap \
-		&& myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
-		|| myconf="${myconf} --with-openldap=no"
-
-	use kerberos \
-		&& myconf="${myconf} --with-krb5=/usr" \
-		|| myconf="${myconf} --without-krb5"
-
-	myconf="${myconf} --with-kde-applnk-path=no"
-
-	# Use Mozilla's NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
-	# Use standalone NSS/NSPR if only 'ssl' in USE
-	# Openssl support doesn't work and has been disabled in cvs
-
-	if use ssl ; then
-		if  use mozilla ; then
-			NSS_LIB=/usr/lib/mozilla
-			NSPR_LIB=/usr/lib/mozilla
-			NSS_INC=/usr/lib/mozilla/include/nss
-			NSPR_INC=/usr/lib/mozilla/include/nspr
-		else
-			NSS_LIB=/usr/lib/nss
-			NSPR_LIB=/usr/lib/nspr
-			NSS_INC=/usr/include/nss
-			NSPR_INC=/usr/include/nspr
-		fi
-
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${NSPR_INC} \
-			--with-nspr-libs=${NSPR_LIB} \
-			--with-nss-includes=${NSS_INC} \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
-		--without-nss-libs --without-nss-includes"
-	fi
-
-	gnome2_src_configure ${G2CONF} ${myconf}
-
-	emake || make || die "make failed"
-}
-
-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'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-
-}
diff --git a/mail-client/evolution/evolution-2.0.2.ebuild b/mail-client/evolution/evolution-2.0.2.ebuild
deleted file mode 100644
index c7c35842e66f..000000000000
--- a/mail-client/evolution/evolution-2.0.2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.2.ebuild,v 1.18 2005/03/23 16:17:35 seemant Exp $
-
-inherit eutils virtualx gnome2 flag-o-matic alternatives
-
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-HOMEPAGE="http://ximian.com/products/evolution/"
-
-LICENSE="GPL-2"
-SLOT="2.0"
-KEYWORDS="x86 amd64 ppc sparc hppa ia64 ~mips alpha"
-IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda"
-
-# Top stanza are ximian deps
-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
-	>=gnome-extra/yelp-2.5.1
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/libgnomecanvas-2.0
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2
-	>=gnome-base/libgnomeprintui-2
-	>=x11-themes/gnome-icon-theme-1.2
-	>=gnome-base/orbit-2.9.8
-	mail-filter/spamassassin
-	pda? ( >=app-pda/gnome-pilot-2.0.10
-		>=app-pda/gnome-pilot-conduits-2.0.10 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( mozilla? ( www-client/mozilla )
-		!mozilla? ( >=dev-libs/nspr-4.4.1
-			>=dev-libs/nss-3.9.2 ) )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig
-	>=sys-devel/libtool-1.4.1-r1
-	>=dev-util/intltool-0.30
-	sys-devel/gettext
-	sys-devel/bison
-	>=app-text/scrollkeeper-0.3.10-r1
-	doc? ( dev-util/gtk-doc )"
-
-G2CONF="--disable-default-binary \
-	$(use_enable ssl nss) \
-	$(use_enable ssl smime) \
-	$(use_enable ipv6) \
-	$(use_enable nntp) \
-	$(use_enable pda pilot-conduits)"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
-ELTCONF="--reverse-deps"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# bug #66166 -- temporary workaround until new baselayout exists
-	epatch ${FILESDIR}/${P}-gentoo_etc_services.patch
-	# bug #67824 -- fix typo of USE -ipv6
-	epatch ${FILESDIR}/${P}-camel_typo.patch
-}
-
-src_compile() {
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	cd ${S}
-	local myconf=""
-
-	use ldap \
-		&& myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
-		|| myconf="${myconf} --with-openldap=no"
-
-	use kerberos \
-		&& myconf="${myconf} --with-krb5=/usr" \
-		|| myconf="${myconf} --without-krb5"
-
-	myconf="${myconf} --with-kde-applnk-path=no"
-
-	# Use Mozilla's NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
-	# Use standalone NSS/NSPR if only 'ssl' in USE
-	# Openssl support doesn't work and has been disabled in cvs
-
-	if use ssl ; then
-		if  use mozilla ; then
-			NSS_LIB=/usr/lib/mozilla
-			NSPR_LIB=/usr/lib/mozilla
-			NSS_INC=/usr/lib/mozilla/include/nss
-			NSPR_INC=/usr/lib/mozilla/include/nspr
-		else
-			NSS_LIB=/usr/lib/nss
-			NSPR_LIB=/usr/lib/nspr
-			NSS_INC=/usr/include/nss
-			NSPR_INC=/usr/include/nspr
-		fi
-
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${NSPR_INC} \
-			--with-nspr-libs=${NSPR_LIB} \
-			--with-nss-includes=${NSS_INC} \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
-		--without-nss-libs --without-nss-includes"
-	fi
-
-	gnome2_src_configure ${G2CONF} ${myconf}
-
-	# Needs to be able to connect to X display to build.
-	Xemake || Xmake || die "make failed"
-}
-
-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'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-
-}
diff --git a/mail-client/evolution/evolution-2.0.3-r1.ebuild b/mail-client/evolution/evolution-2.0.3-r1.ebuild
deleted file mode 100644
index 35bea5ccd101..000000000000
--- a/mail-client/evolution/evolution-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.3-r1.ebuild,v 1.3 2005/03/23 16:17:35 seemant Exp $
-
-inherit eutils gnome2 flag-o-matic alternatives
-
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-HOMEPAGE="http://ximian.com/products/evolution/"
-
-LICENSE="GPL-2"
-SLOT="2.0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~ia64 ~mips ~alpha"
-IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda"
-
-# Top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.2.4
-	>=gnome-extra/gal-2.2.4
-	>=gnome-extra/evolution-data-server-1.0.3
-	>=net-libs/libsoup-2.2.1
-	>=dev-libs/glib-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=gnome-extra/yelp-2.5.1
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2
-	>=gnome-base/libgnomeprintui-2
-	>=x11-themes/gnome-icon-theme-1.2
-	>=gnome-base/orbit-2.9.8
-	mail-filter/spamassassin
-	pda? ( >=app-pda/gnome-pilot-2.0.10
-		>=app-pda/gnome-pilot-conduits-2.0.10 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( mozilla? ( www-client/mozilla )
-		!mozilla? ( >=dev-libs/nspr-4.4.1
-			>=dev-libs/nss-3.9.2 ) )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig
-	>=sys-devel/libtool-1.4.1-r1
-	>=dev-util/intltool-0.30
-	sys-devel/gettext
-	sys-devel/bison
-	>=app-text/scrollkeeper-0.3.10-r1
-	doc? ( dev-util/gtk-doc )"
-
-G2CONF="--disable-default-binary \
-	$(use_enable ssl nss) \
-	$(use_enable ssl smime) \
-	$(use_enable ipv6) \
-	$(use_enable nntp) \
-	$(use_enable pda pilot-conduits)"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
-ELTCONF="--reverse-deps"
-
-src_unpack() {
-	unpack ${A}
-	# bug #66166 -- temporary workaround until new baselayout exists
-	epatch ${FILESDIR}/${P}-gentoo_etc_services.patch
-	# bug #79183 -- fix security vulnerability in camel
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2-CAN-2005-0102.patch
-}
-
-src_compile() {
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	cd ${S}
-	local myconf=""
-
-	use ldap \
-		&& myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
-		|| myconf="${myconf} --with-openldap=no"
-
-	use kerberos \
-		&& myconf="${myconf} --with-krb5=/usr" \
-		|| myconf="${myconf} --without-krb5"
-
-	myconf="${myconf} --with-kde-applnk-path=no"
-
-	# Use Mozilla's NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
-	# Use standalone NSS/NSPR if only 'ssl' in USE
-	# Openssl support doesn't work and has been disabled in cvs
-
-	if use ssl ; then
-		if  use mozilla ; then
-			NSS_LIB=/usr/lib/mozilla
-			NSPR_LIB=/usr/lib/mozilla
-			NSS_INC=/usr/lib/mozilla/include/nss
-			NSPR_INC=/usr/lib/mozilla/include/nspr
-		else
-			NSS_LIB=/usr/lib/nss
-			NSPR_LIB=/usr/lib/nspr
-			NSS_INC=/usr/include/nss
-			NSPR_INC=/usr/include/nspr
-		fi
-
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${NSPR_INC} \
-			--with-nspr-libs=${NSPR_LIB} \
-			--with-nss-includes=${NSS_INC} \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
-		--without-nss-libs --without-nss-includes"
-	fi
-
-	gnome2_src_configure ${G2CONF} ${myconf}
-
-	emake || make || die "make failed"
-}
-
-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'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-
-}
diff --git a/mail-client/evolution/evolution-2.0.3-r2.ebuild b/mail-client/evolution/evolution-2.0.3-r2.ebuild
index c87d1f224356..20e738faa468 100644
--- a/mail-client/evolution/evolution-2.0.3-r2.ebuild
+++ b/mail-client/evolution/evolution-2.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.3-r2.ebuild,v 1.8 2005/04/07 15:34:38 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.3-r2.ebuild,v 1.9 2005/06/06 13:47:35 foser Exp $
 
 inherit eutils gnome2 flag-o-matic alternatives
 
@@ -127,6 +127,12 @@ src_compile() {
 	emake || make || die "make failed"
 }
 
+src_install() {
+
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+
+}
+
 pkg_postinst() {
 
 	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
diff --git a/mail-client/evolution/evolution-2.0.3.ebuild b/mail-client/evolution/evolution-2.0.3.ebuild
deleted file mode 100644
index c2a7be2fbfdc..000000000000
--- a/mail-client/evolution/evolution-2.0.3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.3.ebuild,v 1.3 2005/03/23 16:17:35 seemant Exp $
-
-inherit eutils virtualx gnome2 flag-o-matic alternatives
-
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-HOMEPAGE="http://ximian.com/products/evolution/"
-
-LICENSE="GPL-2"
-SLOT="2.0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~ia64 ~mips ~alpha"
-IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda"
-
-# Top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.2.4
-	>=gnome-extra/gal-2.2.4
-	>=gnome-extra/evolution-data-server-1.0.3
-	>=net-libs/libsoup-2.2.1
-	>=dev-libs/glib-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=gnome-extra/yelp-2.5.1
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2
-	>=gnome-base/libgnomeprintui-2
-	>=x11-themes/gnome-icon-theme-1.2
-	>=gnome-base/orbit-2.9.8
-	mail-filter/spamassassin
-	pda? ( >=app-pda/gnome-pilot-2.0.10
-		>=app-pda/gnome-pilot-conduits-2.0.10 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( mozilla? ( www-client/mozilla )
-		!mozilla? ( >=dev-libs/nspr-4.4.1
-			>=dev-libs/nss-3.9.2 ) )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig
-	>=sys-devel/libtool-1.4.1-r1
-	>=dev-util/intltool-0.30
-	sys-devel/gettext
-	sys-devel/bison
-	>=app-text/scrollkeeper-0.3.10-r1
-	doc? ( dev-util/gtk-doc )"
-
-G2CONF="--disable-default-binary \
-	$(use_enable ssl nss) \
-	$(use_enable ssl smime) \
-	$(use_enable ipv6) \
-	$(use_enable nntp) \
-	$(use_enable pda pilot-conduits)"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
-ELTCONF="--reverse-deps"
-
-src_unpack() {
-	unpack ${A}
-	# bug #66166 -- temporary workaround until new baselayout exists
-	epatch ${FILESDIR}/${P}-gentoo_etc_services.patch
-}
-
-src_compile() {
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	cd ${S}
-	local myconf=""
-
-	use ldap \
-		&& myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
-		|| myconf="${myconf} --with-openldap=no"
-
-	use kerberos \
-		&& myconf="${myconf} --with-krb5=/usr" \
-		|| myconf="${myconf} --without-krb5"
-
-	myconf="${myconf} --with-kde-applnk-path=no"
-
-	# Use Mozilla's NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
-	# Use standalone NSS/NSPR if only 'ssl' in USE
-	# Openssl support doesn't work and has been disabled in cvs
-
-	if use ssl ; then
-		if  use mozilla ; then
-			NSS_LIB=/usr/lib/mozilla
-			NSPR_LIB=/usr/lib/mozilla
-			NSS_INC=/usr/lib/mozilla/include/nss
-			NSPR_INC=/usr/lib/mozilla/include/nspr
-		else
-			NSS_LIB=/usr/lib/nss
-			NSPR_LIB=/usr/lib/nspr
-			NSS_INC=/usr/include/nss
-			NSPR_INC=/usr/include/nspr
-		fi
-
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${NSPR_INC} \
-			--with-nspr-libs=${NSPR_LIB} \
-			--with-nss-includes=${NSS_INC} \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
-		--without-nss-libs --without-nss-includes"
-	fi
-
-	gnome2_src_configure ${G2CONF} ${myconf}
-
-	# Needs to be able to connect to X display to build.
-	Xemake || Xmake || die "make failed"
-}
-
-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'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-
-}
diff --git a/mail-client/evolution/evolution-2.0.4.ebuild b/mail-client/evolution/evolution-2.0.4.ebuild
index 8d7721c12236..db4c816e4630 100644
--- a/mail-client/evolution/evolution-2.0.4.ebuild
+++ b/mail-client/evolution/evolution-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.4.ebuild,v 1.8 2005/05/18 20:19:07 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.4.ebuild,v 1.9 2005/06/06 13:47:35 foser Exp $
 
 inherit eutils gnome2 flag-o-matic alternatives
 
@@ -124,6 +124,12 @@ src_compile() {
 	emake || make || die "make failed"
 }
 
+src_install() {
+
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+
+}
+
 pkg_postinst() {
 
 	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
diff --git a/mail-client/evolution/evolution-2.2.0-r1.ebuild b/mail-client/evolution/evolution-2.2.0-r1.ebuild
deleted file mode 100644
index 68f8c9e3b509..000000000000
--- a/mail-client/evolution/evolution-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.2.0-r1.ebuild,v 1.2 2005/03/23 16:17:35 seemant Exp $
-
-inherit eutils gnome2 flag-o-matic alternatives
-
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-HOMEPAGE="http://ximian.com/products/evolution/"
-
-LICENSE="GPL-2"
-SLOT="2.0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ia64"
-IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda gstreamer mono"
-
-# Top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.6.0
-	>=gnome-extra/gal-2.4.0
-	>=gnome-extra/evolution-data-server-1.2.0
-	>=net-libs/libsoup-2.2.1
-	>=dev-libs/glib-2
-	>=dev-libs/libxml2-2
-	>=x11-libs/pango-1.8.1
-	>=gnome-base/gconf-2
-	>=gnome-extra/yelp-2.5.1
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2
-	>=gnome-base/libgnomeprintui-2
-	>=x11-themes/gnome-icon-theme-1.2
-	>=gnome-base/orbit-2.9.8
-	mail-filter/spamassassin
-	pda? ( >=app-pda/gnome-pilot-2.0.10
-		>=app-pda/gnome-pilot-conduits-2.0.10 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( mozilla? ( www-client/mozilla )
-		!mozilla? ( >=dev-libs/nspr-4.4.1
-			>=dev-libs/nss-3.9.2 ) )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )
-	gstreamer? ( >=media-libs/gstreamer-0.8
-		>=media-libs/gst-plugins-0.8 )
-	mono? ( >=dev-lang/mono-1 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig
-	>=sys-devel/libtool-1.4.1-r1
-	>=dev-util/intltool-0.30
-	sys-devel/gettext
-	sys-devel/bison
-	>=app-text/scrollkeeper-0.3.10-r1
-	doc? ( dev-util/gtk-doc )"
-
-G2CONF="--disable-default-binary \
-		--enable-plugins-all \
-	$(use_enable ssl nss) \
-	$(use_enable ssl smime) \
-	$(use_enable ipv6) \
-	$(use_enable mono) \
-	$(use_enable nntp) \
-	$(use_enable pda pilot-conduits)"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
-ELTCONF="--reverse-deps"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	# Apply patch for "Mark as (un)read" context menu items
-	# see bug #84882 <obz@gentoo.org>
-	epatch ${FILESDIR}/${PN}-2.2-mark-as.patch
-
-}
-
-src_compile() {
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	cd ${S}
-	local myconf=""
-
-	use ldap \
-		&& myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
-		|| myconf="${myconf} --with-openldap=no"
-
-	use kerberos \
-		&& myconf="${myconf} --with-krb5=/usr" \
-		|| myconf="${myconf} --without-krb5"
-
-	myconf="${myconf} --with-kde-applnk-path=no"
-
-	# Use Mozilla's NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
-	# Use standalone NSS/NSPR if only 'ssl' in USE
-	# Openssl support doesn't work and has been disabled in cvs
-
-	if use ssl ; then
-		if  use mozilla ; then
-			NSS_LIB=/usr/$(get_libdir)/mozilla
-			NSPR_LIB=/usr/$(get_libdir)/mozilla
-			NSS_INC=/usr/$(get_libdir)/mozilla/include/nss
-			NSPR_INC=/usr/$(get_libdir)/mozilla/include/nspr
-		else
-			NSS_LIB=/usr/$(get_libdir)/nss
-			NSPR_LIB=/usr/$(get_libdir)/nspr
-			NSS_INC=/usr/include/nss
-			NSPR_INC=/usr/include/nspr
-		fi
-
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${NSPR_INC} \
-			--with-nspr-libs=${NSPR_LIB} \
-			--with-nss-includes=${NSS_INC} \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
-		--without-nss-libs --without-nss-includes"
-	fi
-
-	gnome2_src_configure ${G2CONF} ${myconf}
-
-	emake || make || die "make failed"
-}
-
-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'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-
-}
diff --git a/mail-client/evolution/evolution-2.2.0.ebuild b/mail-client/evolution/evolution-2.2.0.ebuild
deleted file mode 100644
index 43233552d977..000000000000
--- a/mail-client/evolution/evolution-2.2.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.2.0.ebuild,v 1.5 2005/03/23 16:17:35 seemant Exp $
-
-inherit eutils gnome2 flag-o-matic alternatives
-
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-HOMEPAGE="http://ximian.com/products/evolution/"
-
-LICENSE="GPL-2"
-SLOT="2.0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ia64"
-IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda gstreamer mono"
-
-# Top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.6.0
-	>=gnome-extra/gal-2.4.0
-	>=gnome-extra/evolution-data-server-1.2.0
-	>=net-libs/libsoup-2.2.1
-	>=dev-libs/glib-2
-	>=dev-libs/libxml2-2
-	>=x11-libs/pango-1.8.1
-	>=gnome-base/gconf-2
-	>=gnome-extra/yelp-2.5.1
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2
-	>=gnome-base/libgnomeprintui-2
-	>=x11-themes/gnome-icon-theme-1.2
-	>=gnome-base/orbit-2.9.8
-	mail-filter/spamassassin
-	pda? ( >=app-pda/gnome-pilot-2.0.10
-		>=app-pda/gnome-pilot-conduits-2.0.10 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( mozilla? ( www-client/mozilla )
-		!mozilla? ( >=dev-libs/nspr-4.4.1
-			>=dev-libs/nss-3.9.2 ) )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )
-	gstreamer? ( >=media-libs/gstreamer-0.8
-		>=media-libs/gst-plugins-0.8 )
-	mono? ( >=dev-lang/mono-1 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig
-	>=sys-devel/libtool-1.4.1-r1
-	>=dev-util/intltool-0.30
-	sys-devel/gettext
-	sys-devel/bison
-	>=app-text/scrollkeeper-0.3.10-r1
-	doc? ( dev-util/gtk-doc )"
-
-G2CONF="--disable-default-binary \
-		--enable-plugins-all \
-	$(use_enable ssl nss) \
-	$(use_enable ssl smime) \
-	$(use_enable ipv6) \
-	$(use_enable mono) \
-	$(use_enable nntp) \
-	$(use_enable pda pilot-conduits)"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
-ELTCONF="--reverse-deps"
-
-src_compile() {
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	cd ${S}
-	local myconf=""
-
-	use ldap \
-		&& myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
-		|| myconf="${myconf} --with-openldap=no"
-
-	use kerberos \
-		&& myconf="${myconf} --with-krb5=/usr" \
-		|| myconf="${myconf} --without-krb5"
-
-	myconf="${myconf} --with-kde-applnk-path=no"
-
-	# Use Mozilla's NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
-	# Use standalone NSS/NSPR if only 'ssl' in USE
-	# Openssl support doesn't work and has been disabled in cvs
-
-	if use ssl ; then
-		if  use mozilla ; then
-			NSS_LIB=/usr/$(get_libdir)/mozilla
-			NSPR_LIB=/usr/$(get_libdir)/mozilla
-			NSS_INC=/usr/$(get_libdir)/mozilla/include/nss
-			NSPR_INC=/usr/$(get_libdir)/mozilla/include/nspr
-		else
-			NSS_LIB=/usr/$(get_libdir)/nss
-			NSPR_LIB=/usr/$(get_libdir)/nspr
-			NSS_INC=/usr/include/nss
-			NSPR_INC=/usr/include/nspr
-		fi
-
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${NSPR_INC} \
-			--with-nspr-libs=${NSPR_LIB} \
-			--with-nss-includes=${NSS_INC} \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
-		--without-nss-libs --without-nss-includes"
-	fi
-
-	gnome2_src_configure ${G2CONF} ${myconf}
-
-	emake || make || die "make failed"
-}
-
-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'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-
-}
diff --git a/mail-client/evolution/evolution-2.2.1.1.ebuild b/mail-client/evolution/evolution-2.2.1.1.ebuild
index 7fd697584af0..80fd6f055a58 100644
--- a/mail-client/evolution/evolution-2.2.1.1.ebuild
+++ b/mail-client/evolution/evolution-2.2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.2.1.1.ebuild,v 1.5 2005/06/05 19:19:53 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.2.1.1.ebuild,v 1.6 2005/06/06 13:47:35 foser Exp $
 
 inherit eutils gnome2 flag-o-matic alternatives
 
@@ -136,6 +136,13 @@ src_compile() {
 	emake || make || die "make failed"
 }
 
+src_install() {
+
+	# work around #92920 FIXME
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+
+}
+
 pkg_postinst() {
 
 	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
diff --git a/mail-client/evolution/files/digest-evolution-1.4.6 b/mail-client/evolution/files/digest-evolution-1.4.6
deleted file mode 100644
index bba598d859f0..000000000000
--- a/mail-client/evolution/files/digest-evolution-1.4.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4138610c027177e6ffe92bdd565128a6 evolution-1.4.6.tar.bz2 13927597
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/mail-client/evolution/files/digest-evolution-2.0.2 b/mail-client/evolution/files/digest-evolution-2.0.2
deleted file mode 100644
index 568f8e872c8d..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d3f12240ebb05dc6c984af68b5fe1955 evolution-2.0.2.tar.bz2 15400311
diff --git a/mail-client/evolution/files/digest-evolution-2.0.2-r1 b/mail-client/evolution/files/digest-evolution-2.0.2-r1
deleted file mode 100644
index 568f8e872c8d..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.0.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d3f12240ebb05dc6c984af68b5fe1955 evolution-2.0.2.tar.bz2 15400311
diff --git a/mail-client/evolution/files/digest-evolution-2.0.3 b/mail-client/evolution/files/digest-evolution-2.0.3
deleted file mode 100644
index cd4b309c65c4..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a6c15b022f001d52b8533c42e83a462 evolution-2.0.3.tar.bz2 15381448
diff --git a/mail-client/evolution/files/digest-evolution-2.0.3-r1 b/mail-client/evolution/files/digest-evolution-2.0.3-r1
deleted file mode 100644
index cd4b309c65c4..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.0.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a6c15b022f001d52b8533c42e83a462 evolution-2.0.3.tar.bz2 15381448
diff --git a/mail-client/evolution/files/digest-evolution-2.2.0 b/mail-client/evolution/files/digest-evolution-2.2.0
deleted file mode 100644
index ec8b9cc41fc5..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a93991fb80c7fa88f6758661c8931f6b evolution-2.2.0.tar.bz2 13344133
diff --git a/mail-client/evolution/files/digest-evolution-2.2.0-r1 b/mail-client/evolution/files/digest-evolution-2.2.0-r1
deleted file mode 100644
index ec8b9cc41fc5..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a93991fb80c7fa88f6758661c8931f6b evolution-2.2.0.tar.bz2 13344133
diff --git a/mail-client/evolution/files/evolution-1.4.4-alpha.patch b/mail-client/evolution/files/evolution-1.4.4-alpha.patch
deleted file mode 100644
index 7fbf8f648b09..000000000000
--- a/mail-client/evolution/files/evolution-1.4.4-alpha.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- evolution-1.4.4/filter/rule-context.c	2003-06-12 13:04:20.000000000 -0400
-+++ ../../evo-avg/filter/rule-context.c	2003-08-18 14:29:14.000000000 -0400
-@@ -209,7 +209,7 @@
- }
- 
- void
--rule_context_add_part_set(RuleContext *rc, const char *setname, int part_type, RCPartFunc append, RCNextPartFunc next)
-+rule_context_add_part_set(RuleContext *rc, const char *setname, GType part_type, RCPartFunc append, RCNextPartFunc next)
- {
- 	struct _part_set_map *map;
- 	
-@@ -226,7 +226,7 @@
- }
- 
- void
--rule_context_add_rule_set(RuleContext *rc, const char *setname, int rule_type, RCRuleFunc append, RCNextRuleFunc next)
-+rule_context_add_rule_set(RuleContext *rc, const char *setname, GType rule_type, RCRuleFunc append, RCNextRuleFunc next)
- {
- 	struct _rule_set_map *map;
- 	
---- evolution-1.4.4/filter/rule-context.h	2003-04-29 14:14:08.000000000 -0400
-+++ ../../evo-avg/filter/rule-context.h	2003-08-18 14:28:04.000000000 -0400
-@@ -85,14 +85,14 @@
- 
- struct _part_set_map {
- 	char *name;
--	int type;
-+	GType type;
- 	RCPartFunc append;
- 	RCNextPartFunc next;
- };
- 
- struct _rule_set_map {
- 	char *name;
--	int type;
-+	GType type;
- 	RCRuleFunc append;
- 	RCNextRuleFunc next;
- };
-@@ -122,9 +122,9 @@
- int rule_context_get_rank_rule (RuleContext *rc, FilterRule *rule, const char *source);
- 
- /* setup type for set parts */
--void rule_context_add_part_set (RuleContext *rc, const char *setname, int part_type,
-+void rule_context_add_part_set (RuleContext *rc, const char *setname, GType part_type,
- 				RCPartFunc append, RCNextPartFunc next);
--void rule_context_add_rule_set (RuleContext *rc, const char *setname, int rule_type,
-+void rule_context_add_rule_set (RuleContext *rc, const char *setname, GType rule_type,
- 				RCRuleFunc append, RCNextRuleFunc next);
- 
- /* uri's disappear/renamed externally */
diff --git a/mail-client/evolution/files/evolution-1.5.93-addressbooklibs.patch b/mail-client/evolution/files/evolution-1.5.93-addressbooklibs.patch
deleted file mode 100644
index d3a574a4afae..000000000000
--- a/mail-client/evolution/files/evolution-1.5.93-addressbooklibs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- addressbook/gui/component/Makefile.in.orig	2004-08-13 14:38:30.000000000 -0400
-+++ addressbook/gui/component/Makefile.in	2004-08-25 16:01:28.933397392 -0400
-@@ -292,6 +292,7 @@
- 	$(SMIME_LIB)									\
- 	$(top_builddir)/addressbook/printing/libecontactprint.la			\
- 	$(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la	\
-+	$(top_builddir)/camel/libcamel.la						\
- 	$(top_builddir)/shell/libeshell.la						\
- 	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la			\
- 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la			\
diff --git a/mail-client/evolution/files/evolution-2.0.1-camel.patch b/mail-client/evolution/files/evolution-2.0.1-camel.patch
deleted file mode 100644
index 507e5649883b..000000000000
--- a/mail-client/evolution/files/evolution-2.0.1-camel.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/evolution/camel/camel-service.c,v
-retrieving revision 1.92
-retrieving revision 1.93
-diff -u -r1.92 -r1.93
---- camel-service.c	2004/09/24 02:50:45	1.92
-+++ camel-service.c	2004/10/01 18:08:30	1.93
-@@ -897,7 +897,7 @@
- 		hints = &myhints;
- 	}
- 
--	hints->ai_family = AF_INET;
-+	((struct addrinfo *) hints)->ai_family = AF_INET;
- #endif
- 
- 	msg = g_malloc0(sizeof(*msg));
diff --git a/mail-client/evolution/files/evolution-2.0.2-camel_typo.patch b/mail-client/evolution/files/evolution-2.0.2-camel_typo.patch
deleted file mode 100644
index 58cfae38a570..000000000000
--- a/mail-client/evolution/files/evolution-2.0.2-camel_typo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- camel/camel-service.c.old	2004-10-17 13:26:37.177192232 +0100
-+++ camel/camel-service.c	2004-10-17 13:27:14.303548168 +0100
-@@ -896,7 +896,7 @@
- 	else
- 		memcpy (&myhints, hints, sizeof (myhints));
- 	
--	myhints.ai_faimily = AF_INET;
-+	myhints.ai_family = AF_INET;
- 	hints = &myhints;
- #endif
- 
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
deleted file mode 100644
index 7a34c3124ba1..000000000000
--- a/mail-client/evolution/files/evolution-2.0.2-gentoo_etc_services.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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~
---- camel/providers/pop3/camel-pop3-store.c.old	2004-11-15 18:59:42.001851744 +0000
-+++ camel/providers/pop3/camel-pop3-store.c	2004-11-15 18:59:48.603848088 +0000
-@@ -158,7 +158,7 @@
- 		serv = g_alloca(16);
- 		sprintf(serv, "%d", service->url->port);
- 	} else
--		serv = "pop3";
-+		serv = "pop-3";
- 		
- 	if (ssl_mode != USE_SSL_NEVER) {
- #ifdef HAVE_SSL
diff --git a/mail-client/evolution/files/evolution-gcc34.patch b/mail-client/evolution/files/evolution-gcc34.patch
deleted file mode 100644
index af09553f3512..000000000000
--- a/mail-client/evolution/files/evolution-gcc34.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -Naur evolution-1.4.6.orig/addressbook/conduit/address-conduit.c evolution-1.4.6/addressbook/conduit/address-conduit.c
---- evolution-1.4.6.orig/addressbook/conduit/address-conduit.c	2003-08-26 10:45:53.000000000 -0700
-+++ evolution-1.4.6/addressbook/conduit/address-conduit.c	2004-06-18 23:10:02.366091330 -0700
-@@ -609,7 +609,7 @@
- 		return E_CARD_SIMPLE_FIELD_EMAIL_2;
- 	case E_CARD_SIMPLE_FIELD_EMAIL_2:
- 		return E_CARD_SIMPLE_FIELD_EMAIL_3;
--	default:
-+	default: break;
- 	}
- 
- 	return E_CARD_SIMPLE_FIELD_LAST;
-@@ -624,7 +624,7 @@
- 	switch (*field) {
- 	case E_CARD_SIMPLE_FIELD_PHONE_HOME:
- 		return E_CARD_SIMPLE_FIELD_PHONE_HOME_2;
--	default:
-+	default: break;
- 	}
- 
- 	return E_CARD_SIMPLE_FIELD_LAST;
-@@ -639,7 +639,7 @@
- 	switch (*field) {
- 	case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS:
- 		return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2;
--	default:
-+	default: break;
- 	}
- 
- 	return E_CARD_SIMPLE_FIELD_LAST;
-@@ -656,7 +656,7 @@
- 		return E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX;
- 	case E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX:
- 		return E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX;
--	default:
-+	default: break;
- 	}
- 
- 	return E_CARD_SIMPLE_FIELD_LAST;
-diff -Naur evolution-1.4.6.orig/calendar/cal-client/cal-client.c evolution-1.4.6/calendar/cal-client/cal-client.c
---- evolution-1.4.6.orig/calendar/cal-client/cal-client.c	2003-07-15 15:24:47.000000000 -0700
-+++ evolution-1.4.6/calendar/cal-client/cal-client.c	2004-06-18 23:09:18.303892968 -0700
-@@ -2886,7 +2886,7 @@
- 	return cal_client_remove_object_with_mod (client, uid, CALOBJ_MOD_ALL);
- }
- 
--CalClientResult
-+CalClientSendResult
- cal_client_send_object (CalClient *client, icalcomponent *icalcomp, 
- 			icalcomponent **new_icalcomp, GList **users,
- 			char error_msg[256])
-diff -Naur evolution-1.4.6.orig/calendar/gui/e-day-view.c evolution-1.4.6/calendar/gui/e-day-view.c
---- evolution-1.4.6.orig/calendar/gui/e-day-view.c	2003-08-11 20:14:21.000000000 -0700
-+++ evolution-1.4.6/calendar/gui/e-day-view.c	2004-06-18 23:09:18.309891905 -0700
-@@ -3236,6 +3236,7 @@
- 		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
- 		return TRUE;
- 	default:
-+		break;
- 	}
- 
- 	return FALSE;
-@@ -3256,6 +3257,7 @@
- 		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
- 		return TRUE;
- 	default:
-+		break;
- 	}
- 
- 	return FALSE;
-diff -Naur evolution-1.4.6.orig/e-util/e-component-listener.c evolution-1.4.6/e-util/e-component-listener.c
---- evolution-1.4.6.orig/e-util/e-component-listener.c	2003-06-04 08:05:09.000000000 -0700
-+++ evolution-1.4.6/e-util/e-component-listener.c	2004-06-18 23:09:18.311891551 -0700
-@@ -53,6 +53,7 @@
- 			g_object_unref (cl);
- 			break;
- 		default :
-+			break;
- 		}
- 	}
- }
-diff -Naur evolution-1.4.6.orig/mail/message-browser.c evolution-1.4.6/mail/message-browser.c
---- evolution-1.4.6.orig/mail/message-browser.c	2003-07-31 19:45:05.000000000 -0700
-+++ evolution-1.4.6/mail/message-browser.c	2004-06-18 23:09:18.313891197 -0700
-@@ -345,6 +345,7 @@
- 		message_browser_close (NULL, mb, NULL);
- 		return TRUE;	
- 	default:
-+		break;
- 	}
- 	
- 	return FALSE;