Reorder dependencies. Depend on gmime-2.4 as in 2.28. Removing nntp USE flag, it does not pull any dependency and is not properly depended upon in evolution. Drop deprecated gtk-doc fix. Add missing preserved-lib for libecal.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

2 files changed, 16 insertions, 20 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 1f8e9515b183..53d75a5a13e7 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,13 @@
 # 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.270 2010/08/18 22:09:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.271 2010/08/22 19:45:23 eva Exp $
+
+  22 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  evolution-data-server-2.30.2.ebuild:
+  Reorder dependencies. Depend on gmime-2.4 as in 2.28. Removing nntp USE
+  flag, it does not pull any dependency and is not properly depended upon in
+  evolution. Drop deprecated gtk-doc fix. Add missing preserved-lib for
+  libecal.
 
   18 Aug 2010; Markus Meier <maekke@gentoo.org>
   evolution-data-server-2.28.3.1-r1.ebuild:
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild
index 57ce5de392e5..8ec43bc9fff2 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.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.2.ebuild,v 1.5 2010/08/01 11:38:34 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild,v 1.6 2010/08/22 19:45:23 eva Exp $
 
 EAPI="2"
 
@@ -13,25 +13,24 @@ LICENSE="LGPL-2 BSD DB"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 
-IUSE="doc ipv6 kerberos gnome-keyring ldap nntp ssl"
+IUSE="doc ipv6 kerberos gnome-keyring ldap ssl"
 
 RDEPEND=">=dev-libs/glib-2.16.1
 	>=x11-libs/gtk+-2.18
 	>=gnome-base/gconf-2
 	>=dev-db/sqlite-3.5
 	>=dev-libs/libxml2-2
-	>=net-libs/libsoup-2.3
+	>=net-libs/libsoup-2.4
 	>=dev-libs/libgweather-2.25.4
 	>=dev-libs/libical-0.43
 	>=dev-libs/dbus-glib-0.6
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
 	>=sys-libs/db-4
+	sys-libs/zlib
 	virtual/libiconv
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
 	ssl? (
 		>=dev-libs/nspr-4.4
 		>=dev-libs/nss-3.9 )
-	sys-libs/zlib
-
 	ldap? ( >=net-nds/openldap-2.0 )
 	kerberos? ( virtual/krb5 )"
 
@@ -51,7 +50,6 @@ pkg_setup() {
 		$(use_with ldap openldap)
 		$(use_enable gnome-keyring)
 		$(use_enable ipv6)
-		$(use_enable nntp)
 		$(use_enable ssl ssl)
 		$(use_enable ssl smime)
 		--with-weather
@@ -80,14 +78,6 @@ src_prepare() {
 	# 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" \
-			-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
-
 	# /usr/include/db.h is always db-1 on FreeBSD
 	# so include the right dir in CPPFLAGS
 	append-cppflags "-I$(db_includedir)"
@@ -96,10 +86,7 @@ src_prepare() {
 	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"
-
+	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }
 
@@ -120,6 +107,7 @@ src_test() {
 
 pkg_preinst() {
 	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libedata-cal-1.2.so.6
 	preserve_old_lib /usr/$(get_libdir)/libedataserver-1.2.so.11
 }
 
@@ -131,5 +119,6 @@ pkg_postinst() {
 		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
 	fi
 
+	preserve_old_lib_notify /usr/$(get_libdir)/libedata-cal-1.2.so.6
 	preserve_old_lib_notify /usr/$(get_libdir)/libedataserver-1.2.so.11
 }