The camel backends have been moved into evolution-data-server from evolution, so we need to handle the ssl detection properly. See bug #85086 for more information

Package-Manager: portage-1.585-cvs

4 files changed, 108 insertions, 6 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 77826064533b..27312a314941 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.27 2005/03/10 02:16:18 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.28 2005/03/19 10:19:58 obz Exp $
+
+*evolution-data-server-1.2.0-r1 (19 Mar 2005)
+
+  19 Mar 2005; Mike Gardiner <obz@gentoo.org>
+  +evolution-data-server-1.2.0-r1.ebuild:
+  The camel backends have been moved into evolution-data-server from
+  evolution, so we need to handle the ssl detection properly. See bug
+  #85086 for more information
 
   09 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   evolution-data-server-1.0.3.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 80c522b3b499..cb1d55289afd 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,14 +1,16 @@
-MD5 fb1e85463bff0a62e8588eafcc422eee ChangeLog 3830
-MD5 e5e2dd7e8c0e613975275ddc9d74be6f evolution-data-server-1.0.1.ebuild 887
-MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 9ee2551ee83c29d3649add472d45b7ee evolution-data-server-1.0.3.ebuild 987
+MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065
+MD5 227aee2a4f00266d2b83147c0e9a46bc evolution-data-server-1.2.0-r1.ebuild 2358
 MD5 a3406d829592cd280a98c0f4bb38a4f8 evolution-data-server-1.0.4.ebuild 990
 MD5 1097e1ac343ae36a49a3da3824b3d624 evolution-data-server-1.2.0.ebuild 1249
+MD5 e5e2dd7e8c0e613975275ddc9d74be6f evolution-data-server-1.0.1.ebuild 887
+MD5 de6eea1d58767f34d6c115c4eab41c06 ChangeLog 4130
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 bbc32ff03cbc0bac1c13b71aacbcdf80 files/digest-evolution-data-server-1.2.0-r1 81
 MD5 9d35355b61cdb08f0f918e3f106ce953 files/digest-evolution-data-server-1.0.1 81
 MD5 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81
-MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
 MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81
 MD5 677d10afd2898cc22305dd302a01d2e7 files/digest-evolution-data-server-1.0.4 81
 MD5 bbc32ff03cbc0bac1c13b71aacbcdf80 files/digest-evolution-data-server-1.2.0 81
 MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
+MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.2.0-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..bcf5ac4193cb
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.2.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.2.0-r1.ebuild,v 1.1 2005/03/19 10:19:58 obz Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://www.ximian.com/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~ppc64"
+IUSE="doc ldap mozilla ssl ipv6 nntp kerberos"
+
+RDEPEND=">=dev-libs/glib-2
+	>=gnome-base/libbonobo-2.4.2
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/gconf-2
+	>=dev-libs/libxml2-2
+	>=net-libs/libsoup-2.2.2
+	ldap? ( >=net-nds/openldap-2.0 )
+	ssl? ( mozilla? ( net-www/mozilla )
+		  !mozilla? ( >=dev-libs/nspr-4.4
+					  >=dev-libs/nss-3.9 )
+		   )
+	kerberos? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.30
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+G2CONF="${G2CONF} `use_with ldap openldap` \
+		`use_enable ssl nss` \
+		`use_enable ssl smime` \
+		`use_enable ipv6` \
+	    `use_enable nntp`"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+USE_DESTDIR=1
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo_etc_services.patch
+}
+
+src_compile() {
+	cd ${S}/libdb/dist
+	./s_config || die
+
+	cd ${S}
+	local myconf=""
+
+	use kerberos \
+		&& myconf="${myconf} --with-krb5=/usr" \
+		|| myconf="${myconf} --without-krb5"
+
+	# 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 || die "compile failed"
+
+}
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.2.0-r1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.2.0-r1
new file mode 100644
index 000000000000..8fb40b465a92
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.2.0-r1
@@ -0,0 +1 @@
+MD5 9a34499dc8e65af768ab1582803015ef evolution-data-server-1.2.0.tar.bz2 7427456