Version bump, remove old.

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

3 files changed, 35 insertions, 22 deletions

diff --git a/gnome-extra/evolution-exchange/ChangeLog b/gnome-extra/evolution-exchange/ChangeLog
index 7aa3cbaa50dd..c119c78e06da 100644
--- a/gnome-extra/evolution-exchange/ChangeLog
+++ b/gnome-extra/evolution-exchange/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/evolution-exchange
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.136 2011/03/23 08:01:35 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.137 2011/06/19 21:38:54 pacho Exp $
+
+*evolution-exchange-2.32.3 (19 Jun 2011)
+
+  19 Jun 2011; Pacho Ramos <pacho@gentoo.org>
+  -evolution-exchange-2.30.3.ebuild, +evolution-exchange-2.32.3.ebuild:
+  Version bump, remove old.
 
   23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   -evolution-exchange-2.30.2.ebuild, evolution-exchange-2.30.3.ebuild,
diff --git a/gnome-extra/evolution-exchange/Manifest b/gnome-extra/evolution-exchange/Manifest
index 4fb1dcc854ea..0757ef6ee130 100644
--- a/gnome-extra/evolution-exchange/Manifest
+++ b/gnome-extra/evolution-exchange/Manifest
@@ -1,6 +1,16 @@
-DIST evolution-exchange-2.30.3.tar.bz2 1331986 RMD160 5b2d91540c79c9965b79a1ff534095f83e5fc501 SHA1 1f727ffcfd68e9e66ee646014bcd7de7a0d30dba SHA256 45ab89229bc19adca16b979d9b4d8c2c628c07c8b097529773b0a32243e3dfcd
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST evolution-exchange-2.32.2.tar.bz2 1306445 RMD160 f692c066a1a881b2a3ed0753b7e0f4673b09f12e SHA1 b87e160b45c66e6fb951fc9589ca4056fec15267 SHA256 60030eb2de042cef1d703cda7d64c3ec87fcef0bd966012e816954a96cc37d63
-EBUILD evolution-exchange-2.30.3.ebuild 1469 RMD160 8088275e8fe3c8f8af07d0fc1f2b38e644b37010 SHA1 825c2ee02b516fca0e12797495a9eb2f49179822 SHA256 04be956252d04f078e7852d6e5e22220a79a2a8ed09b32aeebdd8f9a182ed609
+DIST evolution-exchange-2.32.3.tar.bz2 1308675 RMD160 cffad254aa2fd31ae1bd2655cbdbb4186a5ca31c SHA1 b7b6896d98eb3dba9d2a675afcc2b984804f6cc4 SHA256 2993d08d16fd8aac2ba0a397455a43ca39398037b49ffc158bb6d2e700771621
 EBUILD evolution-exchange-2.32.2.ebuild 1399 RMD160 bc1b85ba1dad43ffb80847272f57ee171af5c781 SHA1 b64acac75770bf9facf391cec8f8ba2340123cc7 SHA256 21cfc0fc5a4ea661ebb257c07a13daf04b5a264475b1d64bc01a8b960b0a7c3d
-MISC ChangeLog 21266 RMD160 99c3d32502308ec9a5d2be206eaa5b975633a83e SHA1 7275d4b54f9cae8b541d578e0b029ed6ae38ab45 SHA256 69248024d6ae6df06370c4138360a01ee99fcaacc31e54a0b9c727ce12fe34a5
+EBUILD evolution-exchange-2.32.3.ebuild 1346 RMD160 5e003f83726bf47b0ae340dbb3bc7abfbb5daf88 SHA1 a06f44822999522d111a292eaa4cd1e9eaf9d249 SHA256 fc5c8235ccef4239ec4c2f9eeb1e53f05118ccdc6f0ccda109b72667ee52b6dc
+MISC ChangeLog 21452 RMD160 ae25a3b4af0f4cb75de99bb113c936ddd440bd3a SHA1 fde1256e63db3732649c7b3ced9ad823565a7cad SHA256 344ee26794251fff71faff65a2a90502bd12726f925330401cfd29644c95533d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3+bHMACgkQCaWpQKGI+9SSKwCfX+gj9++RdzDXT5qSAdklNWbo
+MygAnj9HM4q8KobjR806m375YJjDFiM1
+=Etdf
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.30.3.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild
index 43cd003be6a1..6a36f233be80 100644
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.30.3.ebuild
+++ b/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild
@@ -1,13 +1,16 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.30.3.ebuild,v 1.2 2011/03/23 08:01:35 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild,v 1.1 2011/06/19 21:38:54 pacho Exp $
 
-EAPI="2"
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit gnome2
 
 DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
-HOMEPAGE="http://www.novell.com/products/desktop/features/evolution.html"
+HOMEPAGE="http://projects.gnome.org/evolution/"
 LICENSE="GPL-2"
 
 SLOT="2.0"
@@ -15,11 +18,11 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug doc static"
 
 RDEPEND="
-	>=mail-client/evolution-${PV}
-	>=gnome-extra/evolution-data-server-${PV}[ldap,kerberos]
-	>=dev-libs/glib-2.16.0:2
-	>=x11-libs/gtk+-2.10:2
-	>=gnome-base/gconf-2.0:2
+	>=mail-client/evolution-2.32.2:2.0
+	>=gnome-extra/evolution-data-server-2.32.2[ldap,kerberos]
+	>=dev-libs/glib-2.16:2
+	>=x11-libs/gtk+-2.20:2
+	>=gnome-base/gconf-2:2
 	dev-libs/libxml2:2
 	net-libs/libsoup:2.4
 	>=net-nds/openldap-2.1.30-r2
@@ -28,30 +31,24 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
-	>=dev-util/gtk-doc-am-1.9
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
 pkg_setup() {
 	G2CONF="${G2CONF}
 		--with-krb5=/usr
 		--with-openldap
 		--disable-static
+		--disable-maintainer-mode
+		--disable-gtk3
 		$(use_enable debug e2k-debug)
 		$(use_with static static-ldap)"
+	DOCS="AUTHORS ChangeLog NEWS README"
 }
 
 src_prepare() {
 	gnome2_src_prepare
 
 	# FIXME: Fix compilation flags crazyness
-	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
+	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
 		-i configure.ac configure || die "sed 1 failed"
-
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \
-		|| die "sed 2 failed"
-
-	sed 's:-DG.*DISABLE_SINGLE_INCLUDES::g' -i configure.ac configure \
-		|| die "sed 3 failed"
 }