New version

(Portage version: 2.0.52-r1)

4 files changed, 136 insertions, 11 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 766f36a05631..bf690489c26a 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,11 @@
 # 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.61 2005/09/14 01:50:29 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.62 2005/10/04 04:11:49 dang Exp $
+
+*evolution-data-server-1.4.1 (04 Oct 2005)
+
+  04 Oct 2005; <dang@gentoo.org> +evolution-data-server-1.4.1.ebuild:
+  New version
 
   14 Sep 2005; <dang@gentoo.org> evolution-data-server-1.4.0.ebuild:
   Remove firefox flag for now, as evo can't be built against it yet and have
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 49b9b7a38e5a..aba57abbce79 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 368efaf736537929d3c127b9608a1ae2 evolution-data-server-1.0.3.ebuild 983
 MD5 5c6f004c99bb5ae4a3cbb29974536ee4 evolution-data-server-1.4.0.ebuild 3590
 MD5 5539f8894a986955933492390ddfcf4d evolution-data-server-1.2.1-r1.ebuild 2435
 MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065
 MD5 0b3c1730fda1bca5e6b717b5a300a45f evolution-data-server-1.2.3.ebuild 2538
 MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985
+MD5 7192f6abe1dc41559dfd57bd2e8e5c09 evolution-data-server-1.4.1.ebuild 3595
 MD5 b4b80eee37f35d75649d61140e5432f9 ChangeLog 8802
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 31de33250de9b6fe2dba0deae946db46 files/evolution-data-server-no_lazy_bindings.patch 551
@@ -17,13 +15,7 @@ MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81
 MD5 677d10afd2898cc22305dd302a01d2e7 files/digest-evolution-data-server-1.0.4 81
 MD5 035a24e01dccf6365e41d4544b019f03 files/digest-evolution-data-server-1.2.3 82
 MD5 e9b5448428c0594682f11bd985ed2d23 files/digest-evolution-data-server-1.4.0 82
+MD5 468aae2242720428d82b966c8066c9f8 files/digest-evolution-data-server-1.4.1 82
 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
 MD5 f198c2b5ab564c7e450ae07be5b1efc5 files/evolution-data-server-1.2.1-local-provider.patch 892
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDJ4kQomPajV0RnrERAhlWAJwM2d9cjgXO9Ze0RYlpnyWSE26JCQCeOGYh
-WOWtUYWANRvlm6ATIndyLOk=
-=/gmG
------END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.4.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.4.1.ebuild
new file mode 100644
index 000000000000..6c9fd5821f72
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.4.1.ebuild
@@ -0,0 +1,127 @@
+# 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.4.1.ebuild,v 1.1 2005/10/04 04:11:49 dang Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://www.ximian.com/"
+
+LICENSE="LGPL-2 Sleepycat"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ipv6 kerberos krb4 ldap mozilla nntp ssl static"
+
+RDEPEND=">=dev-libs/glib-2.4
+	>=gnome-base/libbonobo-2.4.2
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libgnome-2
+	>=dev-libs/libxml2-2
+	>=gnome-base/gconf-2
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-2
+	>=net-libs/libsoup-2.2.2
+	sys-libs/zlib
+	ldap? ( >=net-nds/openldap-2.0 )
+	ssl? (
+		mozilla? ( >=www-client/mozilla-1.7.3 )
+		!mozilla? (
+			>=dev-libs/nspr-4.4
+			>=dev-libs/nss-3.9 ) )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )"
+#		mozilla? ( !firefox? ( >=www-client/mozilla-1.7.3 ) )
+#		firefox? ( >=www-client/mozilla-firefox-1.0.6-r6 )
+#		!mozilla? ( !firefox? (
+#		)
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.28
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+USE_DESTDIR="1"
+DOCS="ChangeLog MAINTAINERS NEWS TODO"
+
+
+pkg_setup() {
+	G2CONF="$(use_with ldap openldap) \
+		$(use_with kerberos krb5 /usr) \
+		$(use_enable ssl nss)          \
+		$(use_enable ssl smime)        \
+		$(use_enable ipv6)             \
+		$(use_enable nntp)             \
+		$(use_enable static)"
+
+	use ldap && G2CONF="${G2CONF} $(use_with static static-ldap)"
+
+	if use krb4 && ! built_with_use virtual/krb5 krb4; then
+		ewarn
+		ewarn "In order to add kerberos 4 support, you have to emerge"
+		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
+		ewarn
+		ewarn "Skipping for now."
+		ewarn
+		G2CONF="${G2CONF} --without-krb4"
+	else
+		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
+	fi
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
+	# upstream gcc4 fix
+	epatch ${FILESDIR}/${PN}-1.2.3-gcc4.patch
+
+	# Resolve symbols at execution time for setgid binaries
+	epatch ${FILESDIR}/${PN}-no_lazy_bindings.patch
+
+	export WANT_AUTOMAKE=1.7
+	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
+		if 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
+
+	cd "${S}/libdb/dist"
+	./s_config || die
+
+	cd "${S}"
+	gnome2_src_compile
+}
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.4.1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.4.1
new file mode 100644
index 000000000000..b6699e2936cb
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.4.1
@@ -0,0 +1 @@
+MD5 af8f53c4ea524df861a6f2eb1ea75ad9 evolution-data-server-1.4.1.tar.bz2 14175490