New release: 1.3.7

Package-Manager: portage-2.0.51.22-r2

5 files changed, 149 insertions, 5 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index f51be8f6638e..784a3c4776a3 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.54 2005/08/02 17:37:41 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.55 2005/08/17 22:00:43 leonardop Exp $
+
+*evolution-data-server-1.3.7 (17 Aug 2005)
+
+  17 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +evolution-data-server-1.3.7.ebuild,
+  +files/evolution-data-server-no_lazy_bindings.patch:
+  New version. Added 'static' and 'krb4' USE flags. Updated dependencies.
+  Added patch to avoid lazy linking in a setgid binary.
 
   02 Aug 2005; Simon Stelling <blubb@gentoo.org>
   evolution-data-server-1.2.3.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 0230d6b826c1..03e43fdfd331 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,16 +1,19 @@
-MD5 e638d6c0bcf37e342df1ef6e4c8c9a7d ChangeLog 7448
+MD5 0cffc47dcb22b52e3abf4051027c0b40 ChangeLog 7776
+MD5 b55f743791e3461e995f4e097c654190 evolution-data-server-1.3.7.ebuild 3023
 MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065
 MD5 368efaf736537929d3c127b9608a1ae2 evolution-data-server-1.0.3.ebuild 983
-MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985
 MD5 5539f8894a986955933492390ddfcf4d evolution-data-server-1.2.1-r1.ebuild 2435
 MD5 c11f9fc55ba2bd476e7250206d383688 evolution-data-server-1.2.3.ebuild 2540
+MD5 284833d0d5526c2c3317c0a1bd375a38 files/digest-evolution-data-server-1.3.7 82
 MD5 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81
 MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81
-MD5 677d10afd2898cc22305dd302a01d2e7 files/digest-evolution-data-server-1.0.4 81
 MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
+MD5 677d10afd2898cc22305dd302a01d2e7 files/digest-evolution-data-server-1.0.4 81
 MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
+MD5 4c61f05d129cfd23c538a74d9c125aa6 files/evolution-data-server-no_lazy_bindings.patch 706
 MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1-r1 81
-MD5 f198c2b5ab564c7e450ae07be5b1efc5 files/evolution-data-server-1.2.1-local-provider.patch 892
 MD5 035a24e01dccf6365e41d4544b019f03 files/digest-evolution-data-server-1.2.3 82
+MD5 f198c2b5ab564c7e450ae07be5b1efc5 files/evolution-data-server-1.2.1-local-provider.patch 892
 MD5 9301f93589ecd825aa39e32465a707a3 files/evolution-data-server-1.2.3-gcc4.patch 558
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.3.7.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.3.7.ebuild
new file mode 100644
index 000000000000..eaf10bca8917
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.3.7.ebuild
@@ -0,0 +1,113 @@
+# 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.3.7.ebuild,v 1.1 2005/08/17 22:00:43 leonardop Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://www.ximian.com/"
+
+LICENSE="GPL-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
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libgnome-2
+	>=dev-libs/libxml2-2
+	>=gnome-base/gconf-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 )
+		!mozilla? (
+			>=dev-libs/nspr-4.4
+			>=dev-libs/nss-3.9 ) )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.30
+	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_enable ssl nss) \
+		$(use_enable ssl smime) $(use_enable ipv6) $(use_enable nntp) \
+		$(use_with kerberos krb5 /usr) $(use_enable static)"
+
+	use ldap && G2CONF="${G2CONF} $(use_with static static-ldap)"
+
+	# 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
+
+		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
+
+	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() {
+	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.3.7 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.3.7
new file mode 100644
index 000000000000..0b9b7fa0bdab
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.3.7
@@ -0,0 +1 @@
+MD5 e05fe0e8607ed4403b19a9d3f407e8f9 evolution-data-server-1.3.7.tar.bz2 14453689
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch
new file mode 100644
index 000000000000..cdd8f43c458d
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch
@@ -0,0 +1,19 @@
+diff -NurdB evolution-data-server-1.3.7/camel/Makefile.am evolution-data-server-1.3.7-patched/camel/Makefile.am
+--- evolution-data-server-1.3.7/camel/Makefile.am	2005-07-08 11:57:02.000000000 -0500
++++ evolution-data-server-1.3.7-patched/camel/Makefile.am	2005-08-17 15:40:24.000000000 -0500
+@@ -271,6 +271,8 @@
+ 	camel-lock-helper.c 			\
+ 	camel-lock-helper.h
+ 
++camel_lock_helper_1_2_LDFLAGS = -Wl,-z,now
++
+ # NOTE: This needs to be cleaned up, it shouldn't link with all this crap,
+ # because it might be setuid.
+ camel_lock_helper_1_2_LDADD =			\
+@@ -331,4 +333,4 @@
+ 	ChangeLog.pre-1-4			\
+ 	README
+ 
+-DISTCLEANFILES = $(pkgconfig_DATA)
+\ No newline at end of file
++DISTCLEANFILES = $(pkgconfig_DATA)