New release: 2.4.0

(Portage version: 2.0.51.22-r2)

5 files changed, 72 insertions, 49 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 77b8c2b20d25..63578dfd6f14 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,14 @@
 # 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.98 2005/09/02 14:12:18 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.99 2005/09/06 05:13:14 leonardop Exp $
+
+*evolution-2.4.0 (05 Sep 2005)
+
+  05 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -evolution-2.3.8-r1.ebuild, +evolution-2.4.0.ebuild:
+  New version. Added 'profile' and 'firefox' USE flags. Install
+  exchange-operations plugin if evolution-data-server was compiled with 'ldap'
+  enabled.
 
 *evolution-2.3.8-r1 (02 Sep 2005)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 3fb711e2dca6..ca5c99b9b444 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,11 +1,14 @@
 MD5 00fb31ca23cfe5425a75aa964b921d79 ChangeLog 30228
 MD5 3318548ad5a620ebd3b5405ef77100fd evolution-1.2.4.ebuild 6254
+MD5 45ca203eefbd22c609d0f58e68531f03 evolution-2.4.0.ebuild 5918
 MD5 3c3a045e22357b7bbb98e000ebf161c1 evolution-2.2.3-r3.ebuild 6063
 MD5 b2bf22eca079cbb39f39c374cb306715 evolution-2.0.3-r2.ebuild 4206
 MD5 6ec9b6a7896b799d17a21c4edffd33c9 metadata.xml 272
 MD5 249e276509b42a3954b5935626218dab evolution-2.0.4.ebuild 4093
+MD5 800cbbef526118bfc49f1b7a0bf94a9a .evolution-2.4.0.ebuild.swp 20480
 MD5 41161e322976cb29f02410622c1459e9 evolution-2.3.8-r1.ebuild 5820
 MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
+MD5 ff6f734b2038ba0c6577ca271d3e7718 files/digest-evolution-2.4.0 70
 MD5 aa077f2d45a8f2def9094b367f1eb60e files/evolution-2.2.3-mail_notify.patch 570
 MD5 37b21b99689c8ad1b67df7ed2425e6cc files/evolution-2.2.3-credits.patch 1838
 MD5 388d698898d1346cb7007da471abed11 files/evolution-2.2.3-linking-fix.patch 1491
diff --git a/mail-client/evolution/evolution-2.3.8-r1.ebuild b/mail-client/evolution/evolution-2.4.0.ebuild
index 82bca9f586b4..c0dc32dc08d9 100644
--- a/mail-client/evolution/evolution-2.3.8-r1.ebuild
+++ b/mail-client/evolution/evolution-2.4.0.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.3.8-r1.ebuild,v 1.1 2005/09/02 14:12:18 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.4.0.ebuild,v 1.1 2005/09/06 05:13:14 leonardop Exp $
 
 inherit eutils flag-o-matic alternatives gnome2
 
@@ -10,9 +10,8 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/"
 LICENSE="GPL-2 FDL-1.1"
 SLOT="2.0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono mozilla nntp pda spell ssl static"
+IUSE="crypt dbus debug doc firefox gstreamer ipv6 kerberos krb4 ldap mono mozilla nntp pda profile spell ssl static"
 
-# Top stanza are ximian deps
 # Pango dependency required to avoid font rendering problems
 RDEPEND=">=x11-themes/gnome-icon-theme-1.2
 	dev-libs/atk
@@ -30,8 +29,9 @@ RDEPEND=">=x11-themes/gnome-icon-theme-1.2
 	>=gnome-base/gconf-2
 	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2.1
-	>=net-libs/libsoup-2.2
+	>=x11-libs/gtk+-2
 	>=gnome-base/libgnome-2
+	>=net-libs/libsoup-2.2.2
 	>=x11-libs/pango-1.8.1
 	mail-filter/spamassassin
 	pda? (
@@ -40,10 +40,11 @@ RDEPEND=">=x11-themes/gnome-icon-theme-1.2
 	spell? ( >=app-text/gnome-spell-1.0.5 )
 	crypt? ( >=app-crypt/gnupg-1.2.2 )
 	ssl? (
-		mozilla? ( www-client/mozilla )
-		!mozilla? (
+		mozilla? ( !firefox? ( >=www-client/mozilla-1.7.3 ) )
+		firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
+		!mozilla? ( !firefox? (
 			>=dev-libs/nspr-4.4.1
-			>=dev-libs/nss-3.9.2 ) )
+			>=dev-libs/nss-3.9.2 ) ) )
 	ldap? ( >=net-nds/openldap-2 )
 	kerberos? ( virtual/krb5 )
 	krb4? ( virtual/krb5 )
@@ -61,16 +62,23 @@ DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	doc? ( >=dev-util/gtk-doc-0.6 )"
 
-USE_DESTDIR="1"
 DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+USE_DESTDIR="1"
 ELTCONF="--reverse-deps"
 
 
 pkg_setup() {
-	G2CONF="--disable-default-binary --without-kde-applnk-path \
-		$(use_enable static) $(use_enable ssl nss) $(use_enable ssl smime) \
-		$(use_enable ipv6) $(use_enable mono) $(use_enable nntp)           \
-		$(use_enable pda pilot-conduits) $(use_with ldap openldap)         \
+	G2CONF="--disable-default-binary \
+		--without-kde-applnk-path        \
+		$(use_enable static)             \
+		$(use_enable ssl nss)            \
+		$(use_enable ssl smime)          \
+		$(use_enable ipv6)               \
+		$(use_enable mono)               \
+		$(use_enable nntp)               \
+		$(use_enable pda pilot-conduits) \
+		$(use_enable profile profiling)  \
+		$(use_with ldap openldap)        \
 		$(use_with kerberos krb5 /usr)"
 
 	use ldap && G2CONF="${G2CONF} $(use_with static static-ldap)"
@@ -87,36 +95,6 @@ pkg_setup() {
 		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
 	fi
 
-	# 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
-	# SSL support has almost entirely moved to e-d-s,
-	# keep an eye on it in rev-bumps (HAVE_SSL)
-	# <obz@gentoo.org>
-
-	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
-
-		G2CONF="${G2CONF} --enable-nss=yes \
-			--with-nspr-includes=${NSPR_INC} \
-			--with-nspr-libs=${NSPR_LIB} \
-			--with-nss-includes=${NSS_INC} \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
 	# Plug-ins to install. Normally we would want something similar to
 	# --enable-plugins=all (plugins_base + plugins_standard), except for some
 	# special cases.
@@ -132,7 +110,10 @@ pkg_setup() {
 	use gstreamer && plugins="${plugins} audio-inline"
 	use dbus && plugins="${plugins} new-mail-notify"
 	use mono && plugins="${plugins} mono"
-	# 'exchange-operations' missing for now
+
+	if built_with_use gnome-extra/evolution-data-server ldap; then
+		plugins="${plugins} exchange-operations"
+	fi
 
 	local pluginlist=""
 	for p in $plugins; do
@@ -144,8 +125,8 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
+	unpack "${A}"
+	cd "${S}"
 
 	gnome2_omf_fix help/omf.make help/C/Makefile.in
 
@@ -153,14 +134,45 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.3.7-configure_plugins.patch
 	# Fix for linking problems, #85013 and #92682
 	epatch ${FILESDIR}/${PN}-2.2.3-linking-fix.patch
-	# Possible work-around for a start-up segfault (bug #104587).
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	# Work-around for a start-up segfault (bug #104587).
+	epatch ${FILESDIR}/${PN}-2.3.8-gentoo.patch
 
 	autoconf || die "autoconf failed"
 	automake || die "automake failed"
 }
 
 src_compile() {
+	# Use NSS/NSPR only if 'ssl' is enabled. They can be used from
+	# mozilla/firefox if the relevant USE flags are enabled. 'firefox' take
+	# precedence over 'mozilla'.
+	if use ssl ; then
+		if use firefox; then
+			NSS_LIB=$(pkg-config --variable=libdir firefox-nss)
+			NSS_INC=$(pkg-config --variable=includedir firefox-nss)/nss
+			NSPR_LIB=$(pkg-config --variable=libdir firefox-nspr)
+			NSPR_INC=$(pkg-config --variable=includedir firefox-nspr)/nspr
+		elif use mozilla; then
+			NSS_LIB=$(pkg-config --variable=libdir mozilla-nss)
+			NSS_INC=$(pkg-config --variable=includedir mozilla-nss)/nss
+			NSPR_LIB=$(pkg-config --variable=libdir mozilla-nspr)
+			NSPR_INC=$(pkg-config --variable=includedir mozilla-nspr)/nspr
+		else
+			NSS_LIB=/usr/$(get_libdir)/nss
+			NSS_INC=/usr/include/nss
+			NSPR_LIB=/usr/$(get_libdir)/nspr
+			NSPR_INC=/usr/include/nspr
+		fi
+
+		G2CONF="${G2CONF} \
+			--with-nspr-includes=${NSPR_INC} \
+			--with-nspr-libs=${NSPR_LIB}     \
+			--with-nss-includes=${NSS_INC}   \
+			--with-nss-libs=${NSS_LIB}"
+	else
+		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
+			--without-nss-libs --without-nss-includes"
+	fi
+
 	# problems with -O3 on gcc-3.3.1
 	replace-flags -O3 -O2
 
diff --git a/mail-client/evolution/files/digest-evolution-2.3.8-r1 b/mail-client/evolution/files/digest-evolution-2.3.8-r1
deleted file mode 100644
index 25d33ffb870c..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.3.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5972fbb96b36cd3420bf1390d63c551 evolution-2.3.8.tar.bz2 11434516
diff --git a/mail-client/evolution/files/digest-evolution-2.4.0 b/mail-client/evolution/files/digest-evolution-2.4.0
new file mode 100644
index 000000000000..38e66ef651f8
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.4.0
@@ -0,0 +1 @@
+MD5 c6b38b9a6ba920be5a859e9ed368508d evolution-2.4.0.tar.bz2 11478244