Bump to 3.0.2.1, from gnome overlay for GNOME 3, remove old.

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

3 files changed, 58 insertions, 62 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 7884c1f153d5..d241f2550d58 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.307 2011/08/13 17:32:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.308 2011/08/18 07:48:34 nirbheek Exp $
+
+*evolution-data-server-3.0.2.1 (18 Aug 2011)
+
+  18 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -evolution-data-server-2.32.3.ebuild, +evolution-data-server-3.0.2.1.ebuild,
+  metadata.xml:
+  Bump to 3.0.2.1, from gnome overlay for GNOME 3, remove old.
 
   13 Aug 2011; Raúl Porcel <armin76@gentoo.org>
   evolution-data-server-2.32.2-r1.ebuild:
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.0.2.1.ebuild
index 739e9dcc39f8..0551635ec984 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.0.2.1.ebuild
@@ -1,71 +1,81 @@
 # Copyright 1999-2011 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.32.3.ebuild,v 1.1 2011/06/19 21:32:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.0.2.1.ebuild,v 1.1 2011/08/18 07:48:34 nirbheek Exp $
 
-EAPI="4"
+EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
 
 inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
 
 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 +weather"
-
-RDEPEND=">=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-2.24:2
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+fi
+IUSE="doc +introspection ipv6 ldap kerberos ssl +weather"
+
+# GNOME3: How do we slot libedataserverui-3.0.so?
+# Also, libedata-cal-1.2.so and libecal-1.2.so use gtk-3, but aren't slotted
+RDEPEND=">=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3.0:3
 	>=gnome-base/gconf-2
 	>=dev-db/sqlite-3.5
-	>=dev-libs/libgdata-0.6.3
+	>=dev-libs/libgdata-0.7.0
+	>=gnome-base/gnome-keyring-2.20.1
 	>=dev-libs/libical-0.43
-	>=net-libs/libsoup-2.4:2.4
+	>=net-libs/libsoup-2.31.2:2.4
 	>=dev-libs/libxml2-2
 	>=sys-libs/db-4
 	sys-libs/zlib
 	virtual/libiconv
-	>=dev-libs/nspr-4.4
-	>=dev-libs/nss-3.9
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 	kerberos? ( virtual/krb5 )
 	ldap? ( >=net-nds/openldap-2 )
-	weather? ( >=dev-libs/libgweather-2.25.4:2 )
+	ssl? (
+		>=dev-libs/nspr-4.4
+		>=dev-libs/nss-3.9 )
+	weather? ( >=dev-libs/libgweather-2.90.0:2 )
 "
 DEPEND="${RDEPEND}
+	dev-lang/perl
 	dev-util/gperf
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.35.5
 	sys-devel/bison
 	>=gnome-base/gnome-common-2
 	>=dev-util/gtk-doc-am-1.9
+	>=sys-devel/gettext-0.17
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 # eautoreconf needs:
 #	>=gnome-base/gnome-common-2
 #	>=dev-util/gtk-doc-am-1.9
 
+# FIXME
+RESTRIC="test"
+
 pkg_setup() {
 	DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-	# ssl stuff always enabled as recommended in upstream bug #642984
+	# Uh, what to do about dbus-call-timeout ?
 	G2CONF="${G2CONF}
-		$(use_enable gnome-keyring)
 		$(use_enable ipv6)
 		$(use_with kerberos krb5 /usr)
 		$(use_with ldap openldap)
-		$(use_with weather)
-		--disable-gtk3
+		$(use_enable ssl ssl)
+		$(use_enable ssl smime)
+		$(use_enable weather)
+		--enable-calendar
+		--enable-nntp
 		--enable-largefile
-		--with-libdb=/usr
-		--enable-ssl
-		--enable-smime"
-
+		--with-libdb=/usr"
 }
 
 src_prepare() {
@@ -75,15 +85,13 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
 
 	# GNOME bug 611353 (skips failing test atm)
-	epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
+	# XXX: uncomment when there's a proper fix
+	#epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
 
 	# GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
-	sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
-		-i addressbook/tests/Makefile.{am,in} \
-		|| die "failing test sed 1 failed"
-
-	# Apply multiple backports and fixed from master and 2.32 branches
-	epatch "${WORKDIR}/${P}-patches"/*.patch
+	#sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
+	#	-i addressbook/tests/Makefile.{am,in} \
+	#	|| die "failing test sed 1 failed"
 
 	# /usr/include/db.h is always db-1 on FreeBSD
 	# so include the right dir in CPPFLAGS
@@ -103,9 +111,8 @@ src_install() {
 	# every .la file's relink_command field, forcing libtool to look there
 	# first during relinking. This will mangle the .la files installed by
 	# make install, but we don't care because we will be punting them anyway.
-	perl "${FILESDIR}/fix_relink_command.pl" . \
-		|| die "fix_relink_command.pl failed"
-
+	perl "${FILESDIR}/fix_relink_command.pl" . ||
+		die "fix_relink_command.pl failed"
 	gnome2_src_install
 
 	if use ldap; then
@@ -125,29 +132,9 @@ src_test() {
 	Xemake check || die "Tests failed."
 }
 
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
-		libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
-		libedata-book-1.2.so.2 libebook-1.2.so.9 \
-		libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
-	do
-		preserve_old_lib /usr/$(get_libdir)/$lib
-	done
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
-		libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
-		libedata-book-1.2.so.2 libebook-1.2.so.9 \
-		libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
-	do
-		preserve_old_lib_notify /usr/$(get_libdir)/$lib
-	done
-
 	if use ldap; then
 		elog ""
 		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
index de1b8f9461ef..9647eabe2a6f 100644
--- a/gnome-extra/evolution-data-server/metadata.xml
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<use>
-	<flag name="weather">Enable optional weather calendar support.</flag>
-</use>
+	<herd>gnome</herd>
+	<use>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+			for introspection</flag>
+		<flag name="weather">Enable optional weather calendar support</flag>
+	</use>
 </pkgmetadata>