New series for Gnome 2.20

(Portage version: 2.1.3.10)

5 files changed, 197 insertions, 1 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 59d2490bc604..f3ddc4faee48 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.150 2007/09/22 08:34:08 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.151 2007/09/30 15:16:23 dang Exp $
+
+*evolution-data-server-1.12.0 (30 Sep 2007)
+
+  30 Sep 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/evolution-data-server-1.11.3-as-needed.patch,
+  +files/evolution-data-server-1.11.3-no-libdb.patch,
+  +evolution-data-server-1.12.0.ebuild:
+  New series for Gnome 2.20
 
   22 Sep 2007; Tom Gall <tgall@gentoo.org>
   evolution-data-server-1.10.3.1.ebuild:
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.12.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.12.0.ebuild
new file mode 100644
index 000000000000..a2be25fbe250
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.12.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2007 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.12.0.ebuild,v 1.1 2007/09/30 15:16:23 dang Exp $
+
+inherit db-use eutils flag-o-matic gnome2 autotools
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="LGPL-2 Sleepycat"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc ipv6 kerberos keyring krb4 ldap ssl"
+
+RDEPEND=">=x11-libs/gtk+-2.10
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/gnome-vfs-2.4
+	>=gnome-base/libbonobo-2.4.2
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=dev-libs/libxml2-2
+	keyring? ( gnome-base/gnome-keyring )
+	ssl? (
+		>=dev-libs/nspr-4.4
+		>=dev-libs/nss-3.9 )
+	>=gnome-base/libgnomeui-2
+	>=net-libs/libsoup-2.2.91
+	>=gnome-base/gnome-common-2
+	sys-libs/zlib
+	=sys-libs/db-4*
+	ldap? ( >=net-nds/openldap-2.0 )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35.5
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+
+DOCS="ChangeLog MAINTAINERS NEWS TODO"
+
+RESTRICT="confcache"
+
+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 keyring gnome-keyring) \
+		--with-libdb=/usr/$(get_libdir)"
+
+	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() {
+	gnome2_src_unpack
+
+	# Fix what ?
+	epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
+
+	# Fix broken libdb build
+	epatch "${FILESDIR}"/${PN}-1.11.3-no-libdb.patch
+
+	# Resolve symbols at execution time for setgid binaries
+	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
+
+	# Rewind in camel-disco-diary to fix a crash
+	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
+
+#-------------Upstream GNOME look here -----------------#
+
+	# --as-needed fixes
+	epatch "${FILESDIR}"/${PN}-1.11.3-as-needed.patch
+
+	# fix for dep ordering so we can add libedataserverui to libexchange-storage
+	# we need to do this or: undefined reference to `e_passwords_get_password'
+	# are the kinds of errors you will get.
+
+	# move the groupwise backend and provider for addressbook, camel, and
+	# calendar to its own folder called server.deps.
+	mkdir server.deps || die "mkdir server.deps failed"
+	mv addressbook/backends/groupwise server.deps/addressbook || die "mv address/groupwise failed"
+	mv camel/providers/groupwise server.deps/camel || die "mv camel/groupwise failed"
+	mv calendar/backends/groupwise server.deps/calendar || die "mv calendar/groupwise failed"
+
+	# now fix the autotools foo for the new directory and the removed ones
+	echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am || die "echo failed"
+
+	# remove groupwise folder from Makefile's since they are in a diff location
+	sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am || die "sed 1 failed"
+
+	# fix configure.in location of the Makefile's
+	sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in || die "sed 2 failed"
+	sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in || die "sed 3 failed"
+	# tack on the server.deps Makefile on our last edit
+	sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in || die "sed 4 failed"
+
+	# fix file includes 
+	sed -i -e 's:<backends/groupwise/e-book-backend-groupwise.h>:"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c || die "sed 5 failed"
+
+	# Fix db version for FreeBSD users where -ldb is always db-1
+	sed -i -e "s:-ldb:-l$(db_libname):" configure.in || die "sed 6 failed"
+
+#---------------Upstream GNOME stop here---------------
+	eautoreconf
+}
+
+src_compile() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		sed -i -e "s|mozilla-nss|nss|
+		s|mozilla-nspr|nspr|" ${S}/configure
+		G2CONF="${G2CONF} --enable-nss=yes"
+	else
+		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
+		--without-nss-libs --without-nss-includes"
+	fi
+
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	append-cppflags "-I$(db_includedir)"
+
+	cd "${S}"
+	gnome2_src_compile
+}
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.0 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.0
new file mode 100644
index 000000000000..98f49a78cb40
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.12.0
@@ -0,0 +1,3 @@
+MD5 787cfe9d652f46395a9adce056bdb286 evolution-data-server-1.12.0.tar.bz2 7463329
+RMD160 f58e5cff47cb1d1937a6fba5b7c6408e3da725ed evolution-data-server-1.12.0.tar.bz2 7463329
+SHA256 854435b58756b365b978f1433bee026d4f5f2973e0c1c2ea279cd2c7c0e8f5f3 evolution-data-server-1.12.0.tar.bz2 7463329
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-as-needed.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-as-needed.patch
new file mode 100644
index 000000000000..fe287ea2377a
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-as-needed.patch
@@ -0,0 +1,35 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-1.11.3.orig/Makefile.am evolution-data-server-1.11.3/Makefile.am
+--- evolution-data-server-1.11.3.orig/Makefile.am	2007-06-04 01:41:14.000000000 -0400
++++ evolution-data-server-1.11.3/Makefile.am	2007-06-07 11:03:46.000000000 -0400
+@@ -9,8 +9,8 @@ if ENABLE_CALENDAR
+ CALENDAR_DIR = calendar
+ endif
+ 
+-SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
+-DIST_SUBDIRS= win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
++SUBDIRS = $(LIBDB) win32 libedataserver camel addressbook $(CALENDAR_DIR) libedataserverui servers server.deps src docs art po
++DIST_SUBDIRS= win32 libedataserver camel addressbook calendar libedataserverui servers server.deps src docs art po
+ 
+ changelogs =			\
+ 	ChangeLog
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-1.11.3.orig/servers/exchange/storage/Makefile.am evolution-data-server-1.11.3/servers/exchange/storage/Makefile.am
+--- evolution-data-server-1.11.3.orig/servers/exchange/storage/Makefile.am	2007-06-01 03:06:39.000000000 -0400
++++ evolution-data-server-1.11.3/servers/exchange/storage/Makefile.am	2007-06-07 11:02:23.000000000 -0400
+@@ -63,14 +63,15 @@ libexchange_storage_1_2_la_LIBADD =				\
+ 	$(top_builddir)/servers/exchange/lib/libexchange.la	\
+ 	$(top_builddir)/servers/exchange/xntlm/libxntlm.la	\
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
++	$(top_builddir)/libedataserverui/libedataserverui-1.2.la\
+ 	$(E_DATA_SERVER_LIBS)					\
+ 	$(E_DATA_SERVER_UI_LIBS)				\
+ 	$(LDAP_LIBS)						\
+ 	$(SOUP_LIBS)						\
+-	$(SOCKET_LIBS)
++	$(SOCKET_LIBS)						\
++	$(KRB5_LDFLAGS)
+ 
+ libexchange_storage_1_2_la_LDFLAGS =				\
+-	$(KRB5_LDFLAGS)						\
+ 	$(NO_UNDEFINED)						\
+ 	-version-info $(LIBEXCHANGE_STORAGE_CURRENT):$(LIBEXCHANGE_STORAGE_REVISION):$(LIBEXCHANGE_STORAGE_AGE)
+ 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-no-libdb.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-no-libdb.patch
new file mode 100644
index 000000000000..b2b7769289e8
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-no-libdb.patch
@@ -0,0 +1,13 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-1.11.3.orig/configure.in evolution-data-server-1.11.3/configure.in
+--- evolution-data-server-1.11.3.orig/configure.in	2007-06-04 06:50:47.000000000 -0400
++++ evolution-data-server-1.11.3/configure.in	2007-06-07 10:58:22.000000000 -0400
+@@ -1431,9 +1431,6 @@ export privdatadir
+ if test $enable_calendar = yes; then
+         AC_CONFIG_SUBDIRS(calendar/libical)
+ fi
+-if test $dynamic_libdb = no; then
+-        AC_CONFIG_SUBDIRS(libdb/dist)
+-fi
+ AC_OUTPUT([
+ Makefile
+ evolution-data-server-zip