Version bump. Also added ELTCONF='--reverse-deps', this should solve bug #59814

4 files changed, 145 insertions, 9 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 79375bf8d4e0..4b6854202726 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.10 2004/08/13 22:32:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.11 2004/08/24 15:07:15 tseng Exp $
+
+*evolution-1.5.93 (24 Aug 2004)
+
+  24 Aug 2004; Brandon Hale <tseng@gentoo.org> +evolution-1.5.93.ebuild:
+  Version bump. Also added ELTCONF='--reverse-deps', this should solve bug #59814
 
   13 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
   evolution-1.5.92.1.ebuild:
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 8eb03fec08e9..7f478fe035ca 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,17 +1,19 @@
-MD5 dad6657ce9376178fb561002aa40f5e0 evolution-1.2.4.ebuild 6251
 MD5 dd3e30cf2ae2af39f7fce74a047317ee evolution-1.4.5.ebuild 5740
+MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
 MD5 8358897fdee4e24d373ddd74db7a8cf9 evolution-1.4.6.ebuild 5472
-MD5 146049a338ebbb78d46c5fa0ce92679c ChangeLog 17605
 MD5 612f0fb276269f7fce478ad36a657627 evolution-1.5.92.1.ebuild 3599
-MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
+MD5 e09479d82971fbe547f25b2e65dc3208 evolution-1.5.93.ebuild 3624
+MD5 dad6657ce9376178fb561002aa40f5e0 evolution-1.2.4.ebuild 6251
+MD5 4acb764546f91059ad71c4d447b8b42c ChangeLog 17790
 MD5 eb83bc7208b2fc2063f030dce73eb15e files/digest-evolution-1.5.92.1 73
+MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
 MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
-MD5 6174a41481c88eb948a8e119cf93ea94 files/evolution-1.4.5-nztimezone.patch 1852
+MD5 63aaa2baf8d7107a3a4c08c4c85efcec files/digest-evolution-1.5.93 71
+MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
 MD5 d863019d9fb9a8f74c5090de0f1ceee4 files/evolution-1.4.5-gtk-2.4.patch 26799
-MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
-MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
 MD5 3137288dd17e357d0972dab00e4f6b6d files/digest-evolution-1.2.4 1230
 MD5 49463c08f32ee1df0970196b6c4cef2b files/digest-evolution-1.4.5 132
-MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
 MD5 4df81c3442025403034c53975ba663b1 files/evolution-gcc34.patch 3044
-MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
+MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
+MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
+MD5 6174a41481c88eb948a8e119cf93ea94 files/evolution-1.4.5-nztimezone.patch 1852
diff --git a/mail-client/evolution/evolution-1.5.93.ebuild b/mail-client/evolution/evolution-1.5.93.ebuild
new file mode 100644
index 000000000000..7ea689e836b4
--- /dev/null
+++ b/mail-client/evolution/evolution-1.5.93.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.5.93.ebuild,v 1.1 2004/08/24 15:07:15 tseng Exp $
+
+inherit eutils virtualx gnome2 debug flag-o-matic
+
+# problems with -O3 on gcc-3.3.1
+replace-flags -O3 -O2
+
+DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
+HOMEPAGE="http://ximian.com/products/evolution/"
+
+LICENSE="GPL-2"
+SLOT="2.0"
+KEYWORDS="~x86"
+IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda"
+RESTRICT="nomirror"
+
+# Top stanza are ximian deps
+RDEPEND=">=gnome-extra/libgtkhtml-3.1.20
+	>=gnome-extra/gal-2.1.14
+	>=gnome-extra/evolution-data-server-0.0.98
+	>=net-libs/libsoup-2.1.13
+	>=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
+	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? ( net-www/mozilla )
+		   !mozilla? ( >=dev-libs/nspr-4.3
+						>=dev-libs/nss-3.8 ) )
+	ldap? ( >=net-nds/openldap-2.0 )
+	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )"
+
+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
+	doc? ( dev-util/gtk-doc
+		>=app-text/scrollkeeper-0.3.10-r1 )"
+
+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_compile() {
+	elibtoolize
+
+	if [ "${ARCH}" = "hppa" ]; then
+		append-flags "-fPIC -ffunction-sections"
+		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+	fi
+
+	einfo "Compiling Evolution..."
+	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
+			NSS_INC=/usr/lib/mozilla/include
+		else
+			NSS_LIB=/usr/lib
+			NSS_INC=/usr/include
+		fi
+
+		myconf="${myconf} --enable-nss=yes \
+			--with-nspr-includes=${NSS_INC}/nspr \
+			--with-nspr-libs=${NSS_LIB} \
+			--with-nss-includes=${NSS_INC}/nss \
+			--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() {
+	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/files/digest-evolution-1.5.93 b/mail-client/evolution/files/digest-evolution-1.5.93
new file mode 100644
index 000000000000..9f02c7944db3
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-1.5.93
@@ -0,0 +1 @@
+MD5 a01dc293bca189461f6cbd61b0a5a0ee evolution-1.5.93.tar.bz2 12839720