remove kde applnk installation because new kde now looks in /usr/share/applications. added evo-1.5 devel version, based on submission from Joe McCann <joe@breakmygentoo.net> (#35456)

5 files changed, 154 insertions, 15 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index ce395c40e84c..ad686c4c042c 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,14 @@
 # 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.8 2004/07/28 03:36:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.9 2004/08/06 19:41:03 liquidx Exp $
+
+*evolution-1.5.92.1 (06 Aug 2004)
+
+  06 Aug 2004; Alastair Tse <liquidx@gentoo.org> evolution-1.4.6.ebuild,
+  +evolution-1.5.92.1.ebuild:
+  remove kde applnk installation because new kde now looks in
+  /usr/share/applications. added evo-1.5 devel version, based on submission from
+  Joe McCann <joe@breakmygentoo.net> (#35456)
 
   27 Jul 2004; <agriffis@gentoo.org> evolution-1.4.6.ebuild:
   stable on alpha and ia64
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 8a75c5cfc793..fdeb20833cd7 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,15 +1,20 @@
 MD5 1148fc5b5fc50afc6f66bf69239a9b32 evolution-1.2.4.ebuild 6261
 MD5 dfe2bd6b6edfa87b2db2c0cfb278f2c2 evolution-1.4.5.ebuild 5746
-MD5 6c06b5ca1efdcfa2a62fb8a57ca7cead evolution-1.4.6.ebuild 5601
-MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
+MD5 385074fc925d7da793ffca9f77f6c734 .#evolution-1.4.6.ebuild.1.8 5473
+MD5 95ebe9b3ac1695c8ca35a15d0755770d .#Manifest.1.10 1335
+MD5 9b08feb3a7d5cb7bf1735ae36dd4528b evolution-1.4.6.ebuild 5477
 MD5 15b96fd6cc7f92a4673ce982c5704072 ChangeLog 17169
+MD5 47beef52b45dd76f43e1711b00c05cd6 evolution-1.5.92.1.ebuild 3534
+MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
+MD5 eb83bc7208b2fc2063f030dce73eb15e files/digest-evolution-1.5.92.1 73
+MD5 f84d9bdbf22f3a20ce046b0f97fd0896 files/digest-evolution-1.5.91 71
+MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
+MD5 6174a41481c88eb948a8e119cf93ea94 files/evolution-1.4.5-nztimezone.patch 1852
+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 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
-MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
-MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
-MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
-MD5 d863019d9fb9a8f74c5090de0f1ceee4 files/evolution-1.4.5-gtk-2.4.patch 26799
-MD5 6174a41481c88eb948a8e119cf93ea94 files/evolution-1.4.5-nztimezone.patch 1852
 MD5 4df81c3442025403034c53975ba663b1 files/evolution-gcc34.patch 3044
+MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
diff --git a/mail-client/evolution/evolution-1.4.6.ebuild b/mail-client/evolution/evolution-1.4.6.ebuild
index 3d19f56bb568..bb2f8aad1e05 100644
--- a/mail-client/evolution/evolution-1.4.6.ebuild
+++ b/mail-client/evolution/evolution-1.4.6.ebuild
@@ -1,9 +1,7 @@
 # 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.4.6.ebuild,v 1.9 2004/07/28 03:36:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.4.6.ebuild,v 1.10 2004/08/06 19:41:03 liquidx Exp $
 
-# kde before gnome2, otherwise kde_src_install will override gnome2_src_install
-use kde && inherit kde
 inherit flag-o-matic virtualx gnome2 eutils
 
 # problems with -O3 on gcc-3.3.1
@@ -14,7 +12,7 @@ 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 kde crypt"
+IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos crypt"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc hppa alpha amd64 ia64"
@@ -137,8 +135,8 @@ src_compile() {
 		&& myconf="${myconf} --enable-ipv6=yes" \
 		|| myconf="${myconf} --enable-ipv6=no"
 
-	use kde && [ -n "${KDEDIR}" ] \
-		&& myconf="${myconf} --with-kde-applnk-path=${KDEDIR}/share/applnk"
+	# KDE 3.2 does not need applnk anymore
+	myconf="${myconf} --with-kde-applnk-path=no"
 
 	use amd64 && myconf="${myconf} --with-pic"
 
diff --git a/mail-client/evolution/evolution-1.5.92.1.ebuild b/mail-client/evolution/evolution-1.5.92.1.ebuild
new file mode 100644
index 000000000000..a3d4f5530d62
--- /dev/null
+++ b/mail-client/evolution/evolution-1.5.92.1.ebuild
@@ -0,0 +1,127 @@
+# 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.92.1.ebuild,v 1.1 2004/08/06 19:41:03 liquidx 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.19
+	>=gnome-extra/gal-2.1.13
+	>=gnome-extra/evolution-data-server-0.0.97
+	>=net-libs/libsoup-2.1.12
+	>=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/ORBit2-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"
+
+
+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 [ -n "`use ssl`" ]; then
+		if [ -n "`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.92.1 b/mail-client/evolution/files/digest-evolution-1.5.92.1
new file mode 100644
index 000000000000..387334a35d71
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-1.5.92.1
@@ -0,0 +1 @@
+MD5 4e83d43dbecc60d2ce88c961183b29e7 evolution-1.5.92.1.tar.bz2 12376932