Version bump

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 62 insertions, 134 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 76ad6173ea4c..440f018a4f18 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.261 2010/06/13 19:03:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.262 2010/06/23 12:56:30 pacho Exp $
+
+*evolution-data-server-2.30.2 (23 Jun 2010)
+
+  23 Jun 2010; Pacho Ramos <pacho@gentoo.org>
+  -evolution-data-server-2.28.2.ebuild,
+  -evolution-data-server-2.30.1-r1.ebuild,
+  +evolution-data-server-2.30.2.ebuild,
+  +files/evolution-data-server-2.30.2-revert-addressbook.patch:
+  Version bump with updated translations and fixes, remove old.
 
 *evolution-data-server-2.30.1-r1 (13 Jun 2010)
 
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 7c5689ddce83..81f46c128f36 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -10,21 +10,19 @@ AUX evolution-data-server-2.25.90-no-libdb.patch 355 RMD160 fcf879d6b7997f573181
 AUX evolution-data-server-2.26.3-camel-vee-folder.patch 1072 RMD160 5ea77f129629744e8b147cf707b6dee16b21d7dc SHA1 f8a3383c841edb5f345dced8a99fc38c9d6d28e9 SHA256 4bd7b35d7ba55e5a452aeeef1d96e2372d6312f533489259f7b777b0a6963ff4
 AUX evolution-data-server-2.28.0-gentoo_etc_services.patch 1294 RMD160 058a86636b5b544c312f086f31902b38001484f1 SHA1 2e7fb34243ed00efdcec2fda3fc109856ca451ff SHA256 14a3954871868cbae15891cfcb87135fd82077628f7ad49290fb955aeb4f192a
 AUX evolution-data-server-2.28.3.1-version-number.patch 1192 RMD160 17c142918982cb8272d8f36e794dd170cb212626 SHA1 45da8bdca73cd1805d74119fe26427a780f89033 SHA256 b5c5476a2b37eb6871d1c786bacde8212fd0aebf4e23ec56587b6b92de1bba32
+AUX evolution-data-server-2.30.2-revert-addressbook.patch 1670 RMD160 ca8d68745caf933bbd78c6a371fedc1725881fe3 SHA1 6fe8191f0107de97dc4aa39086281e0d4af2ce5b SHA256 cb35ab5a715db8d56d1e05d723bedbcb73f1d14da74cba0579b65b9d9e2a2675
 DIST evolution-data-server-2.26.3.tar.bz2 7167764 RMD160 83f68a464a0cfb50511f33e662d8a24ede42b9e6 SHA1 a9406b748d5a002df9570d17c91066575f2ba408 SHA256 ed2698d64dc663900b50f7a461d79c25e310462b7d41b1073257cbf950e75071
-DIST evolution-data-server-2.28.2.tar.bz2 22319961 RMD160 5041260ffa3430104c812ec5495bf6cba40c347f SHA1 dd2f35ed6765651c9daf0e709e0e9d65604d1eed SHA256 12e3ba23e4021a70be9cb6d418d1966883ee940bfa1a298294b036bde90faf2c
 DIST evolution-data-server-2.28.3.1.tar.bz2 14461320 RMD160 11f5c0311de98e590bba73a9a46d33c4d42d8538 SHA1 64dec0b300f3ba15da3969eb8e84b0e81b2842de SHA256 3f0457b755873533773f8f1c17cef8f6a25b77b7baf0e98100389e1210970d17
-DIST evolution-data-server-2.30.1-patches.tar.bz2 25178 RMD160 d7cd59e67bdc42da9d9d1fdabf1be1f52c41170f SHA1 7c99d13087835fb56d5dd01884a70f24539b1c28 SHA256 4617ebc23ce0250424428ff54c1e38ef27f847104a832019c704a2f4f7b5fcd3
-DIST evolution-data-server-2.30.1.tar.bz2 4636784 RMD160 fe3a2a2a7333a631fcfe81c1afee80b1acf77235 SHA1 18d2517234edc85309b7e86ec1e9b946d37227b6 SHA256 b2ebeac36931fbee6fb747ee535a61243dd99fa15bc472ca239f2b01cc88795e
+DIST evolution-data-server-2.30.2.tar.bz2 4643434 RMD160 a4748e462b7b293bf35ddf9b79d7d50a6ca8ee6e SHA1 aabab98c3efec2a5d3c0b3443aa6cf43bbd06bfa SHA256 a691319a8f269fc80608611fe30ceb7a552550067f31615efc268a9b7d3c1bf2
 EBUILD evolution-data-server-2.26.3.ebuild 3528 RMD160 6cf1472c699e9c60bc4a4d2266946c5b487fdfd1 SHA1 48e90958f963d2fdfcecb71af026b7cd613831ea SHA256 08725da4208365da62c149a1ccf1ca62660d68f92556e63a899c110bffa0f6e9
-EBUILD evolution-data-server-2.28.2.ebuild 3299 RMD160 e0231e682e4d2b664e0ad51ccfc7d61ac7d6a42e SHA1 daf8280801cf1a105b79bb116ea6440c7822a489 SHA256 37e4ccb8bbf1d2658dbc246d5c761221fa83d04b43f6dbc4c17a4149bdc0cb05
 EBUILD evolution-data-server-2.28.3.1-r1.ebuild 3433 RMD160 7ec43b3d204dcd318e0e6a24b09ee4e951c064a0 SHA1 805477f7b7d4609ae26d72a1d5946327e420217d SHA256 13d0afc8d45f89752824813150ec4ea16655680547b2939c180952a602daa281
-EBUILD evolution-data-server-2.30.1-r1.ebuild 3468 RMD160 927e05497ab6c447fcc7f87d10879cec4432f0a3 SHA1 d2985f3df850d95758f5e777c4da6ac9f2cc8bed SHA256 d351ff711116bc48707f3fbcee4a2c84da9974d65e5229dfd6dc338cb3291e67
-MISC ChangeLog 50191 RMD160 54f56a54662432f9a4da45902f3a71134699f94d SHA1 1425073730c1cdf3d60ab25ce125e0eaff5fed8e SHA256 086b566a1a357a8a5fbc090f1bb77cc18ee5da5d3b11fa3e525d8091f0564e2f
+EBUILD evolution-data-server-2.30.2.ebuild 3437 RMD160 0a7c6feb5e1751bb920f001414245219b25fca67 SHA1 8b34fe6a0d74e517c21cad3d35d432c29cd09ad6 SHA256 2b7e4781e26370792719e6ed6ae6d57d4a3d2685f157a3716ba1bd2353a93443
+MISC ChangeLog 50534 RMD160 2d1bdfb98bef44611f48556041fd3b1a9a75d3b1 SHA1 053a44dbc2cf08f01ea2bb8f4d4df532b10fc91a SHA256 46ba9166974f938a3aaf48b60e1798f4f680500c3c4d7cb1ea1ab06017523524
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwVO2YACgkQCaWpQKGI+9QgVwCeIMLu5vsdu7ZYAWDATc4MlpDZ
-1GYAn2P6GBPM19Bj4OfRq05ljZInds9O
-=xjHm
+iEYEARECAAYFAkwiBIMACgkQCaWpQKGI+9RFHACdFnU/blB+DxXpSPBROowSbOPY
+VgoAnizkpxCi0yQECUV+fqPuNhgp73MP
+=w+Co
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.28.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.28.2.ebuild
deleted file mode 100644
index 8f1377d5c799..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.28.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2010 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-2.28.2.ebuild,v 1.3 2010/01/17 06:51:11 ulm Exp $
-
-EAPI="2"
-
-inherit db-use eutils flag-o-matic gnome2 versionator
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 BSD DB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl"
-
-RDEPEND=">=dev-libs/glib-2.16.1
-	>=x11-libs/gtk+-2.14
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=dev-libs/libxml2-2
-	>=net-libs/libsoup-2.4
-	>=dev-libs/libgweather-2.25.4
-	>=dev-libs/libical-0.43
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
-	>=dev-db/sqlite-3.5
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
-	sys-libs/zlib
-	=sys-libs/db-4*
-	ldap? ( >=net-nds/openldap-2.0 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( app-crypt/mit-krb5[krb4] )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-2
-	>=dev-util/gtk-doc-am-1.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_with ldap openldap)
-		$(use_with krb4 krb4 /usr)
-		$(use_with kerberos krb5 /usr)
-		$(use_enable ssl nss)
-		$(use_enable ssl smime)
-		$(use_enable ipv6)
-		$(use_enable gnome-keyring)
-		--with-weather
-		--with-libdb=/usr/$(get_libdir)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Adjust to gentoo's /etc/service
-	epatch "${FILESDIR}/${PN}-2.28.0-gentoo_etc_services.patch"
-
-	# Rewind in camel-disco-diary to fix a crash
-	epatch "${FILESDIR}/${PN}-1.8.0-camel-rewind.patch"
-
-	if use doc; then
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
-			-i gtk-doc.make || die "sed 1 failed"
-	else
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
-			-i gtk-doc.make || die "sed 2 failed"
-	fi
-
-	# 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 || die "sed failed"
-		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)"
-
-	# FIXME: Fix compilation flags crazyness
-	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
-		-i configure.ac configure || die "sed 3 failed"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "intltool rules fix failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use ldap; then
-		MY_MAJORV=$(get_version_component_range 1-2)
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema || die "doins failed"
-		dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use ldap; then
-		elog ""
-		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
-	fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.30.1-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild
index 6b5213cdcc69..8e501e34670e 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.30.1-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-2.30.1-r1.ebuild,v 1.1 2010/06/13 19:03:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild,v 1.1 2010/06/23 12:56:30 pacho Exp $
 
 EAPI="2"
 
@@ -13,9 +13,6 @@ LICENSE="LGPL-2 BSD DB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-patches.tar.bz2"
-
 IUSE="doc ipv6 kerberos gnome-keyring ldap nntp ssl"
 
 RDEPEND=">=dev-libs/glib-2.16.1
@@ -74,8 +71,8 @@ src_prepare() {
 	# GNOME bug 611353 (skips failing test atm)
 	epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
 
-	# Apply upstream patches committed to gnome-2-30 branch
-	epatch "${WORKDIR}"/${P}-patches/*.patch
+	# Revert "Bug 619347 - Return formatted address in e_destination_get_address"
+	epatch "${FILESDIR}/${P}-revert-addressbook.patch"
 
 	if use doc; then
 		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.30.2-revert-addressbook.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.30.2-revert-addressbook.patch
new file mode 100644
index 000000000000..51b3230558d2
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.30.2-revert-addressbook.patch
@@ -0,0 +1,42 @@
+From a9d0d64ab9aa61855fce0537b90fc05924bc3d85 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Mon, 21 Jun 2010 11:28:22 +0000
+Subject: Revert "Bug 619347 - Return formatted address in e_destination_get_address"
+
+This reverts commit db8c986c4f06f0cb57de9bfa6982b4e78f0bb32a.
+
+Despite the misleading documentation, e_destination_get_address() -is-
+intended to return an encoded address suitable for use in mail headers.
+e_destination_get_textrep() exists for displaying destination addresses
+to the user.  The Contact List Editor is apparently calling the wrong
+function.
+---
+diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
+index 00b7e76..6ed9870 100644
+--- a/addressbook/libebook/e-destination.c
++++ b/addressbook/libebook/e-destination.c
+@@ -881,11 +881,11 @@ e_destination_get_address (const EDestination *dest)
+ 				iter = g_list_next (iter);
+ 			}
+ 
+-			priv->addr = camel_address_format (CAMEL_ADDRESS (addr));
++			priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
+ 		} else if (priv->raw) {
+ 
+ 			if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw)) {
+-				priv->addr = camel_address_format (CAMEL_ADDRESS (addr));
++				priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
+ 			}
+ 		} else {
+ 			const gchar *name, *email;
+@@ -900,7 +900,7 @@ e_destination_get_address (const EDestination *dest)
+ 				nothing we can do here */
+ 				camel_address_decode (CAMEL_ADDRESS (addr), name);
+ 
+-			priv->addr = camel_address_format (CAMEL_ADDRESS (addr));
++			priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
+ 		}
+ 
+ 		camel_object_unref (CAMEL_OBJECT (addr));
+--
+cgit v0.8.3.1