Raise libunique dependency. Enable libcanberra always per other gnome package policy. Add missing gtk-doc dependency. Add USE nntp as in 2.28. Block <evolution-exchange-2.30 as relevant .pc file is not provided anymore.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 35 insertions, 15 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 6b982dbc241e..9128a15b062e 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.302 2010/08/14 18:39:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.303 2010/08/23 20:20:55 eva Exp $
+
+  23 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  evolution-2.30.2-r1.ebuild:
+  Raise libunique dependency. Enable libcanberra always per other gnome
+  package policy. Add missing gtk-doc dependency. Add USE nntp as in 2.28.
+  Block <evolution-exchange-2.30 as relevant .pc file is not provided
+  anymore.
 
   14 Aug 2010; Raúl Porcel <armin76@gentoo.org> evolution-2.28.3.1.ebuild:
   alpha/ia64/sparc stable wrt #314899
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 61c57d5008a6..b8b7fc77608f 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX evolution-2.21.3-fbsd.patch 1107 RMD160 7dbbf08ed68124a398b9db64bac6a4b0cecfa9ef SHA1 05f581d030bb81aad2e0f734f432dd23add4b3c2 SHA256 942b81689f9e4b5a1896ec7c810c323bfaeb74d40c6c6683d8dfd8b670236e77
 AUX evolution-2.23.3.1-delete-key.patch 2382 RMD160 41e30f2f9e52c8a1a45db11d12fa5da8eb137c04 SHA1 2df3f06c427072d2de7bf379f6d0b6fedaf2a4e1 SHA256 37809a6b12cb93a6da0cf11a50e33d040380ac31b1377eba867e3a12f92d1cbc
 AUX evolution-2.26.3-automagic-plugins.patch 7022 RMD160 2e7279257e90c66abbfc4703ba0fbba015b6f484 SHA1 23602b5b73caf2b06235422042ae3e32c6b520c3 SHA256 acae2843c8068b298b0e54eb263b3b7582ddf272aae5c0ceffa3d4d095f40e91
@@ -16,6 +19,13 @@ DIST evolution-2.30.2.tar.bz2 32570501 RMD160 c1b5703bc241a2dee20f94e60e7c9995c8
 EBUILD evolution-2.26.3.ebuild 4474 RMD160 969fc82fb9207a1b30710d0ceac59d44e58ff3a6 SHA1 2a34a86256377aece30bd133699aa4a0d112b549 SHA256 de6801a09682a57f663fa28610493df9d4dad22a2a2cc34f06c40f7e8f050bad
 EBUILD evolution-2.28.3.1-r1.ebuild 5273 RMD160 2dd659e7fdea2694ab7e35023fca8ae33d3bb775 SHA1 5c574cd7016c4112edaab7c706afde8e138a6495 SHA256 d3f897b3877d01f1f2257df8291956e742e2a6ba0e87a7c472c6fe7625a812b2
 EBUILD evolution-2.28.3.1.ebuild 4776 RMD160 635a26b79e548eae0307f92ab414733043a271eb SHA1 38dc812719d7e59986ecb7d2c72c3a8daefe343d SHA256 dba152baf57204968e92ca6690967001a715104d0a20d1ef11a09231da6b3822
-EBUILD evolution-2.30.2-r1.ebuild 4516 RMD160 42a4086e321f9cc65c12910fee60a06d67b2a511 SHA1 00a4acef7c5f7ebb8c13b1472f6fd20f905c19bb SHA256 5f96cd07fa46214746c5136f9a591184c28d0f60b4105f2050983136d7f2ee62
-MISC ChangeLog 70699 RMD160 885640e41b6353275ca00ee9f0c60727814c0665 SHA1 51521d15d59c4403154ae07ceb6ac37d32ec1637 SHA256 27b002f1f5c118cfcc53f5c10985d1bcc9953b9203d63f29c67c3167767a417c
+EBUILD evolution-2.30.2-r1.ebuild 4650 RMD160 b5e94d9fdac48137f09bb15daaa9b19a4c89678f SHA1 b04ec7135735f506b383fdf6d406460d84bd4a57 SHA256 a646bfa39c9148ab02b7fc0a09d0d87ee11a474f6ad220a85412cf2c8ccfb4b8
+MISC ChangeLog 71008 RMD160 5fd751b69889c4111ffdf3828669a847abcfa1c7 SHA1 37a7ccdab88025deb606bab2743b5d9890b3b96c SHA256 991416fc415b0313b2a5e160e6b09a7bbaed78e9c7bff536527552b84beee285
 MISC metadata.xml 1532 RMD160 44749261021a81bb77167cd8ea800eb18a99dfee SHA1 3a52cba14a151672c86eceb118e7757a12ec91a3 SHA256 d642c82216a4ce3c5f45ea007f4d5055beab1261baea130becc2d37d1bfb3797
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxy2E4ACgkQ1fmVwcYIWAaH3gCgmZshf31SOK+PuRmXPKihSLn+
+HwcAoMJ1i47r7i81sHQscBcL2FO+sp6W
+=2reW
+-----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.30.2-r1.ebuild b/mail-client/evolution/evolution-2.30.2-r1.ebuild
index 93691f40c9e5..360ba6336eae 100644
--- a/mail-client/evolution/evolution-2.30.2-r1.ebuild
+++ b/mail-client/evolution/evolution-2.30.2-r1.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/mail-client/evolution/evolution-2.30.2-r1.ebuild,v 1.4 2010/08/01 11:50:58 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.2-r1.ebuild,v 1.5 2010/08/23 20:20:55 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -9,16 +9,13 @@ inherit autotools gnome2 flag-o-matic python versionator
 
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
 HOMEPAGE="http://www.gnome.org/projects/evolution/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-patches.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2 OPENLDAP"
 SLOT="2.0"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-patches.tar.bz2"
-
-IUSE="crypt kerberos ldap networkmanager pda profile python ssl
-gstreamer +sound"
+IUSE="crypt gstreamer kerberos ldap networkmanager nntp pda profile python ssl"
 # pst
 # mono - disabled because it just crashes on startup :S
 
@@ -34,11 +31,12 @@ RDEPEND=">=dev-libs/glib-2.22
 	>=gnome-base/libgnomecanvas-2
 	dev-libs/atk
 	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/libunique-1
+	>=dev-libs/libunique-1.1.2
 	>=dev-libs/libxml2-2.7.3
 	>=dev-libs/libgweather-2.25.3
 	>=net-libs/libsoup-2.4
 	>=media-gfx/gtkimageview-1.6
+	media-libs/libcanberra[gtk]
 	x11-libs/libnotify
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.20
@@ -57,10 +55,11 @@ RDEPEND=">=dev-libs/glib-2.22
 		>=app-pda/gnome-pilot-2.0.16
 		>=app-pda/gnome-pilot-conduits-2 )
 	python? ( >=dev-lang/python-2.4 )
-	sound? ( media-libs/libcanberra )
 	ssl? (
 		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )"
+		>=dev-libs/nss-3.11 )
+
+	!<gnome-extra/evolution-exchange-2.30"
 # champlain, geoclue, clutter, gtkimageview
 #	mono? ( >=dev-lang/mono-1 )
 
@@ -71,7 +70,10 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	app-text/scrollkeeper
 	>=gnome-base/gnome-common-2.12.0
-	>=app-text/gnome-doc-utils-0.9.1"
+	>=app-text/gnome-doc-utils-0.9.1
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/gtk-doc-am-1.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
 
 DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 ELTCONF="--reverse-deps"
@@ -81,12 +83,13 @@ pkg_setup() {
 		--without-kde-applnk-path
 		--enable-plugins=experimental
 		--enable-image-inline
+		--enable-canberra
 		--enable-weather
 		$(use_enable ssl nss)
 		$(use_enable ssl smime)
 		$(use_enable networkmanager nm)
+		$(use_enable nntp)
 		$(use_enable gstreamer audio-inline)
-		$(use_enable sound canberra)
 		--disable-pst-import
 		$(use_enable pda pilot-conduits)
 		$(use_enable profile profiling)