Remove USE="krb4" because app-crypt/mit-krb5 doesn't have krb4 support anymore.

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

5 files changed, 20 insertions, 30 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 0b13d2a5c9f2..0cbce458d9c0 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # 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.300 2010/08/01 11:50:58 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.301 2010/08/05 16:54:14 ssuominen Exp $
+
+  05 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  evolution-2.26.3.ebuild, evolution-2.28.3.1.ebuild,
+  evolution-2.28.3.1-r1.ebuild:
+  Remove USE="krb4" because app-crypt/mit-krb5 doesn't have krb4 support
+  anymore.
 
   01 Aug 2010; Christian Faulhammer <fauli@gentoo.org>
   evolution-2.30.2-r1.ebuild:
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 9667e5becd4a..e5ef01a04b09 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,6 +1,3 @@
------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,16 +13,9 @@ DIST evolution-2.26.3.tar.bz2 36427464 RMD160 f2b3aa2275095feb2af406022c0a6bc8a3
 DIST evolution-2.28.3.1.tar.bz2 29765375 RMD160 442c7b472caf94ba0aa1abbe253b810d15911a4f SHA1 412c8be73e483444ad69a4ad8c15b0db9520fe0a SHA256 9fda41b0994b1bb8d119f594597f77bb4af1a883588a39f7a81ec7a2eb18f5fd
 DIST evolution-2.30.2-patches.tar.bz2 12728 RMD160 d8058da75675a1990aad84348a40cd3f7be21aa3 SHA1 4bbb89f10ba893ef992af5fc32aad84b2ad46d2f SHA256 f3d6dcfba9ee7c21b415d04a545902cb5a28d1bcc00e579c6cc78aeac7650a45
 DIST evolution-2.30.2.tar.bz2 32570501 RMD160 c1b5703bc241a2dee20f94e60e7c9995c8cce841 SHA1 14ddccbf33eb86c976899eccea6ae1fb565ea9ca SHA256 470d12c0de9cae2dc0275152a356150c7a57339e6feca77f43508bd7d1f04d83
-EBUILD evolution-2.26.3.ebuild 4538 RMD160 98dbfe0beb7fee6801e25f0c817453ca2d7f2ff4 SHA1 2a7add15cd29bb16946d837fb62d0e91586109e6 SHA256 93dd558bbb3d36eab6749dc2b4381c50e11075072612365607925a40fbc692dd
-EBUILD evolution-2.28.3.1-r1.ebuild 5337 RMD160 c29c1057f187c453eaf861d159c09b3b22d3f171 SHA1 0096eec5b290152836d6646997843e551b93c1e6 SHA256 bfe6ef549e4af2e031b4e8b98d518d8fd20bd72d19f3dc02a8319042890b265c
-EBUILD evolution-2.28.3.1.ebuild 4845 RMD160 57399f3bc4b2dbc8a2c0c680a0aa0f3bccb5f051 SHA1 d5111e673d7bfd5fe082f7066c65dd846eb9ea82 SHA256 596545b5f5652754910529dbf59f941c3866d4e2e3bb36c74f21543a905ea950
+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 4781 RMD160 d968b41019c55b378de1ab2a3be0b590a5041bab SHA1 7d28afb2d953ae6c490acc1f4e19b1125c86138e SHA256 912497d2202a2ed07ac71c74cf586f3a6b00ec5c629e654d1dd5a1d04b1fffa9
 EBUILD evolution-2.30.2-r1.ebuild 4516 RMD160 42a4086e321f9cc65c12910fee60a06d67b2a511 SHA1 00a4acef7c5f7ebb8c13b1472f6fd20f905c19bb SHA256 5f96cd07fa46214746c5136f9a591184c28d0f60b4105f2050983136d7f2ee62
-MISC ChangeLog 70357 RMD160 3d48643252518d6eb9103bced58533e0b251d89a SHA1 acf2ca041bb30ec31a5ac5d0de81a72d9c6c8638 SHA256 20bd925250cb9693faccbc180bfdd0e827c6052206d5b19c3ffaa24261326510
+MISC ChangeLog 70586 RMD160 1b35559b593fa77e92f5c6c11f01be609db3f29a SHA1 07d4da80058e6e53e3f34e9a2b99a57e8fe690c6 SHA256 9b1f34fa38abc7f47f5918fa83eaa03e8ffa9eec33bdfc9996fe9a2321ac1756
 MISC metadata.xml 1532 RMD160 44749261021a81bb77167cd8ea800eb18a99dfee SHA1 3a52cba14a151672c86eceb118e7757a12ec91a3 SHA256 d642c82216a4ce3c5f45ea007f4d5055beab1261baea130becc2d37d1bfb3797
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxVYEEACgkQNQqtfCuFneNaCgCgh/d3qtI+FOPHZV2HOtj5m73R
-JZYAn3wupOLfF1uIDNEdXQYtKZq+ccfS
-=rB4F
------END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.26.3.ebuild b/mail-client/evolution/evolution-2.26.3.ebuild
index 59b74049142e..c96cb96610df 100644
--- a/mail-client/evolution/evolution-2.26.3.ebuild
+++ b/mail-client/evolution/evolution-2.26.3.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.26.3.ebuild,v 1.16 2010/07/19 15:18:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.26.3.ebuild,v 1.17 2010/08/05 16:54:14 ssuominen Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/"
 LICENSE="GPL-2 FDL-1.1"
 SLOT="2.0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="crypt dbus hal kerberos krb4 ldap mono networkmanager nntp pda profile python ssl gstreamer exchange"
+IUSE="crypt dbus hal kerberos ldap mono networkmanager nntp pda profile python ssl gstreamer exchange"
 # pst
 
 # Pango dependency required to avoid font rendering problems
@@ -45,7 +45,6 @@ RDEPEND=">=dev-libs/glib-2.18
 	networkmanager? ( net-misc/networkmanager )
 	>=net-libs/libsoup-2.4
 	kerberos? ( virtual/krb5 )
-	krb4? ( app-crypt/mit-krb5[krb4] )
 	>=gnome-base/orbit-2.9.8
 	crypt? ( || (
 				  ( >=app-crypt/gnupg-2.0.1-r2
@@ -93,8 +92,7 @@ pkg_setup() {
 		$(use_enable profile profiling)
 		$(use_enable python)
 		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)
-		$(use_with krb4 krb4 /usr)"
+		$(use_with kerberos krb5 /usr)"
 
 	# dang - I've changed this to do --enable-plugins=experimental.  This will
 	# autodetect new-mail-notify and exchange, but that cannot be helped for the
diff --git a/mail-client/evolution/evolution-2.28.3.1-r1.ebuild b/mail-client/evolution/evolution-2.28.3.1-r1.ebuild
index d6e8cdca0d42..f5c85b49d3e3 100644
--- a/mail-client/evolution/evolution-2.28.3.1-r1.ebuild
+++ b/mail-client/evolution/evolution-2.28.3.1-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.28.3.1-r1.ebuild,v 1.3 2010/07/19 15:18:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild,v 1.4 2010/08/05 16:54:14 ssuominen Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/"
 LICENSE="GPL-2 FDL-1.1"
 SLOT="2.0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="crypt dbus hal kerberos krb4 ldap mono networkmanager nntp pda profile python ssl gstreamer exchange"
+IUSE="crypt dbus hal kerberos ldap mono networkmanager nntp pda profile python ssl gstreamer exchange"
 # pst
 
 # Pango dependency required to avoid font rendering problems
@@ -49,7 +49,6 @@ RDEPEND=">=dev-libs/glib-2.20
 		>=dev-libs/dbus-glib-0.74 )
 	>=net-libs/libsoup-2.4
 	kerberos? ( virtual/krb5 )
-	krb4? ( app-crypt/mit-krb5[krb4] )
 	>=gnome-base/orbit-2.9.8
 	crypt? ( || (
 				  ( >=app-crypt/gnupg-2.0.1-r2
@@ -97,8 +96,7 @@ pkg_setup() {
 		$(use_enable profile profiling)
 		$(use_enable python)
 		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)
-		$(use_with krb4 krb4 /usr)"
+		$(use_with kerberos krb5 /usr)"
 
 	# DBUS is required for NetworkManager support (Bug #317841)
 	use networkmanager && G2CONF="${G2CONF} --enable-dbus"
diff --git a/mail-client/evolution/evolution-2.28.3.1.ebuild b/mail-client/evolution/evolution-2.28.3.1.ebuild
index e736ebb4af0f..70a46ce5c698 100644
--- a/mail-client/evolution/evolution-2.28.3.1.ebuild
+++ b/mail-client/evolution/evolution-2.28.3.1.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.28.3.1.ebuild,v 1.6 2010/07/19 15:18:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.28.3.1.ebuild,v 1.7 2010/08/05 16:54:14 ssuominen Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/"
 LICENSE="GPL-2 FDL-1.1"
 SLOT="2.0"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="crypt dbus hal kerberos krb4 ldap mono networkmanager nntp pda profile python ssl gstreamer exchange"
+IUSE="crypt dbus hal kerberos ldap mono networkmanager nntp pda profile python ssl gstreamer exchange"
 # pst
 
 # Pango dependency required to avoid font rendering problems
@@ -47,7 +47,6 @@ RDEPEND=">=dev-libs/glib-2.20
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	>=net-libs/libsoup-2.4
 	kerberos? ( virtual/krb5 )
-	krb4? ( app-crypt/mit-krb5[krb4] )
 	>=gnome-base/orbit-2.9.8
 	crypt? ( || (
 				  ( >=app-crypt/gnupg-2.0.1-r2
@@ -95,8 +94,7 @@ pkg_setup() {
 		$(use_enable profile profiling)
 		$(use_enable python)
 		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)
-		$(use_with krb4 krb4 /usr)"
+		$(use_with kerberos krb5 /usr)"
 
 	# dang - I've changed this to do --enable-plugins=experimental.  This will
 	# autodetect new-mail-notify and exchange, but that cannot be helped for the