Bump to 1.8.2

Package-Manager: portage-2.1.2_rc1-r7

4 files changed, 163 insertions, 5 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index e749a173807d..5569fba6ca83 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.98 2006/11/06 00:48:35 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.99 2006/11/21 17:31:14 dang Exp $
+
+*evolution-data-server-1.8.2 (21 Nov 2006)
+
+  21 Nov 2006; <dang@gentoo.org> +evolution-data-server-1.8.2.ebuild:
+  Bump to 1.8.2
 
   06 Nov 2006; John N. Laliberte <allanonjl@gentoo.org>
   evolution-data-server-1.8.1-r1.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index fc44fed6e980..e27a6dbc5788 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -37,6 +37,7 @@ SHA256 772bdd99f3936d377cd0ce59c4f03789d227b79c4a2ca2d5e7e3165c378c6403 files/ev
 DIST evolution-data-server-1.4.2.1.tar.bz2 14234151 RMD160 708de00a4ec796bf26466fa419af6b1998449893 SHA1 d7396f893ad811d531fe1c40ef47f36a9155bcad SHA256 052f80b23551352c6f55ef2b4c970a416ec2e92fa4e5fd3bd267ce6eca1a9326
 DIST evolution-data-server-1.6.2.tar.bz2 7179353 RMD160 59af916ab4a9fabc14c65c16189188f829459985 SHA1 b9bcea4fbcdd0a39cb23e7cd1bc53a59c474a74d SHA256 3b02b940aaa90034609b9401d3da586e5439363ade9bf8d7fc562acacd28bfde
 DIST evolution-data-server-1.8.1.tar.bz2 7119647 RMD160 64fc3e0a4e83bc5c2b7913441056ede7ca3caace SHA1 3adcc50e0a381c51576980c4a94ba4a8e31415d9 SHA256 5fb63ea67899ba3d6f1866594a2f237609b36eb985e9621ee3cb494e15e71956
+DIST evolution-data-server-1.8.2.tar.bz2 6963774 RMD160 b3ae6d2dafa0abbbaf5ffe2fbdc39b6b20fe762d SHA1 7b6ba62d96b6c54e762be4ddf1c476ebf8201dc1 SHA256 63a765c237504ed34344f7ef505c495d9a40c6022b7d69ca6ded32016508fecd
 EBUILD evolution-data-server-1.4.2.1.ebuild 2817 RMD160 879a6faee0cb1d953b5dab0a923ad4ce431f2198 SHA1 0ef8c15dbc54d82b1ead43b1b8e6c24fcd2bfc2e SHA256 27b55125c5fb5ed760cf9e117c3107f0fe28685575138d14b5ed11bf1204ea9b
 MD5 92b5975db320481885feff20ba1ff137 evolution-data-server-1.4.2.1.ebuild 2817
 RMD160 879a6faee0cb1d953b5dab0a923ad4ce431f2198 evolution-data-server-1.4.2.1.ebuild 2817
@@ -49,10 +50,14 @@ EBUILD evolution-data-server-1.8.1-r1.ebuild 4546 RMD160 6a09c98877de285431d5cbb
 MD5 0491fd0d576eced7d348c21bb439c9f3 evolution-data-server-1.8.1-r1.ebuild 4546
 RMD160 6a09c98877de285431d5cbb97f63fa88f668f82c evolution-data-server-1.8.1-r1.ebuild 4546
 SHA256 7e524e2823ce3ecc245cf20daa1b15548a6e9d85e01ff81c69be4ae1d40f4d36 evolution-data-server-1.8.1-r1.ebuild 4546
-MISC ChangeLog 14719 RMD160 7c278157050bbe99515998346a98cb38444a3680 SHA1 7a3b56d87d236f8eb381f0ddc6372898b960d1a5 SHA256 3a424c4a438c7cd8c5076e5e8d0b503eea38cd24577c153dd490b7f40db27fec
-MD5 2b739273a853e422e4a5cc91706107b0 ChangeLog 14719
-RMD160 7c278157050bbe99515998346a98cb38444a3680 ChangeLog 14719
-SHA256 3a424c4a438c7cd8c5076e5e8d0b503eea38cd24577c153dd490b7f40db27fec ChangeLog 14719
+EBUILD evolution-data-server-1.8.2.ebuild 4457 RMD160 33f3c193a31ef5e80dc37d84622fe7ec59444ea3 SHA1 485d8b63256a86264ea17667c04b74228ba3dfef SHA256 48f51ce7285e5fc03c39940ae68fd3fa69754962370a76b22317beb9b7e90b97
+MD5 e13a7f39725dc608a4dfcd0ebe0ca36a evolution-data-server-1.8.2.ebuild 4457
+RMD160 33f3c193a31ef5e80dc37d84622fe7ec59444ea3 evolution-data-server-1.8.2.ebuild 4457
+SHA256 48f51ce7285e5fc03c39940ae68fd3fa69754962370a76b22317beb9b7e90b97 evolution-data-server-1.8.2.ebuild 4457
+MISC ChangeLog 14845 RMD160 6cb1bcd1064582adf781ac5909b72107ae38d1fe SHA1 e554219419d5bd248b65a65516d39ed457f49147 SHA256 5751669fdbacf5ed3a7eebab659d38496d16bd360b18c48d40946c44da39532c
+MD5 3f6b24d9fbddbdcf84946aaf6692fd48 ChangeLog 14845
+RMD160 6cb1bcd1064582adf781ac5909b72107ae38d1fe ChangeLog 14845
+SHA256 5751669fdbacf5ed3a7eebab659d38496d16bd360b18c48d40946c44da39532c ChangeLog 14845
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -66,3 +71,6 @@ SHA256 c474de3fb11f9641e62deea95bc409b7d208389cf6deca8c15c08a39a0c70d14 files/di
 MD5 baf4bee9f32064aef77d306d30e5ace9 files/digest-evolution-data-server-1.8.1-r1 289
 RMD160 5d29a92c465cbe9d5d47064807693768e725d040 files/digest-evolution-data-server-1.8.1-r1 289
 SHA256 0984d9930bf0b7ffc779161e60fbf45ea5937e9520f093060976fef8ea8d8eb8 files/digest-evolution-data-server-1.8.1-r1 289
+MD5 74393fb4db3fbf45310fa2141a7dc047 files/digest-evolution-data-server-1.8.2 289
+RMD160 bb30bba0b9040f1814f971dcb2f92d509a82759c files/digest-evolution-data-server-1.8.2 289
+SHA256 0385bd5f744f65836836983a6ffa381ce6e536914986f9ab3c5dbf4ee1b058bd files/digest-evolution-data-server-1.8.2 289
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.8.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.8.2.ebuild
new file mode 100644
index 000000000000..27fc7af1189c
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.8.2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2006 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.8.2.ebuild,v 1.1 2006/11/21 17:31:14 dang Exp $
+
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="latest"
+inherit eutils 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"
+IUSE="doc ipv6 kerberos keyring krb4 ldap nntp ssl"
+
+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
+	>=gnome-base/gnome-common-2
+	keyring? ( gnome-base/gnome-keyring )
+	>=dev-libs/libxml2-2
+	>=gnome-base/gconf-2
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-2
+	>=net-libs/libsoup-2.2.90
+	sys-libs/zlib
+	=sys-libs/db-4*
+	ldap? ( >=net-nds/openldap-2.0 )
+	ssl? (
+		>=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.35
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+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 nntp)		\
+		$(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
+
+	epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
+
+	# Fix broken libdb build
+	epatch "${FILESDIR}"/${PN}-1.7.3-libdb.patch
+
+	# Resolve symbols at execution time for setgid binaries
+	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
+
+	# exchange-storage --as-needed fixes
+	epatch "${FILESDIR}"/${PN}-1.7.3-exchange-storage.patch
+	epatch "${FILESDIR}"/${PN}-1.7.4-move-subdirs.patch
+
+	# Rewind in camel-disco-diary to fix a crash
+	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
+
+#-------------Upstream GNOME look here -----------------#
+
+	# 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
+	mv addressbook/backends/groupwise server.deps/addressbook
+	mv camel/providers/groupwise server.deps/camel
+	mv calendar/backends/groupwise server.deps/calendar
+
+	# now fix the autotools foo for the new directory and the removed ones
+	echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am
+
+	# 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
+
+	# fix configure.in location of the Makefile's
+	sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in
+	sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in
+	# 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
+
+	# 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
+
+#---------------Upstream GNOME stop here---------------
+	eautoreconf
+}
+
+src_compile() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		NSS_LIB=/usr/$(get_libdir)/nss
+		NSS_INC=/usr/include/nss
+		NSPR_LIB=/usr/$(get_libdir)/nspr
+		NSPR_INC=/usr/include/nspr
+
+		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}"
+	gnome2_src_compile
+}
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.2 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.2
new file mode 100644
index 000000000000..7dabc9ec79bc
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.2
@@ -0,0 +1,3 @@
+MD5 fe7545411f7417bd246e15ae07ae9f54 evolution-data-server-1.8.2.tar.bz2 6963774
+RMD160 b3ae6d2dafa0abbbaf5ffe2fbdc39b6b20fe762d evolution-data-server-1.8.2.tar.bz2 6963774
+SHA256 63a765c237504ed34344f7ef505c495d9a40c6022b7d69ca6ded32016508fecd evolution-data-server-1.8.2.tar.bz2 6963774