Removed krb4 support as it is depreciated upstream.

Package-Manager: portage-2.1.1_pre1-r1

4 files changed, 22 insertions, 37 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 14e76a421ff8..acc43dfaa5db 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.395 2006/07/01 19:16:17 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.396 2006/07/03 12:07:22 gothgirl Exp $
+
+  03 Jul 2006; gothgirl <gothgirl@gentoo.org> gaim-1.5.0.ebuild,
+  gaim-2.0.0_beta3-r1.ebuild:
+  Removed krb4 support as it is depreciated upstream.
 
   01 Jul 2006; gothgirl <gothgirl@gentoo.org>
   +files/gaim-2.0.0_beta3-avahi-compat.patch, gaim-2.0.0_beta3-r1.ebuild:
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index c87ac0156a46..6a06e00063d1 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -12,18 +12,18 @@ RMD160 0012a39e59134ea580958fe0c0d278dde65b0ab7 files/gaim-2.0.0_beta3-avahi-com
 SHA256 e9e3a9a3d0a474e6325c5d205d6906032b9998a11df71c4cb8935102138e3a28 files/gaim-2.0.0_beta3-avahi-compat.patch 977
 DIST gaim-1.5.0.tar.bz2 6123237
 DIST gaim-2.0.0beta3.tar.bz2 8056708 RMD160 f7c7273ebb5149b5eb3b3759f4a1d756f68392c5 SHA1 e23363cdcf928d503c6fa583239537b409d10b84 SHA256 5ce3a0054b26e96cacb5471d0d3456fde00223cadc267a3e010155b6a2ffe710
-EBUILD gaim-1.5.0.ebuild 4378 RMD160 6087a5b3705ba8e1fa6758f91c827391ee0011e9 SHA1 048f17acbf18e5577a64263e431ebd8f539ec15e SHA256 799f0ce6662c968d994dad6481b3ee2d96e1bbb7350ebafed3e00612883f650e
-MD5 a148b4dfc20af2c9a6824f30d0735c8a gaim-1.5.0.ebuild 4378
-RMD160 6087a5b3705ba8e1fa6758f91c827391ee0011e9 gaim-1.5.0.ebuild 4378
-SHA256 799f0ce6662c968d994dad6481b3ee2d96e1bbb7350ebafed3e00612883f650e gaim-1.5.0.ebuild 4378
-EBUILD gaim-2.0.0_beta3-r1.ebuild 6441 RMD160 70ff2603d151a5aac16aac84245d6724d6e88c4c SHA1 24c6dd3892144ee3325c7094c87931713fb3b073 SHA256 5c1ee637462603c3cc54b6a0a8ea77511d3666ae05636dc477b24eeafedf7340
-MD5 46612428a77967ba1d88f41476ee61fc gaim-2.0.0_beta3-r1.ebuild 6441
-RMD160 70ff2603d151a5aac16aac84245d6724d6e88c4c gaim-2.0.0_beta3-r1.ebuild 6441
-SHA256 5c1ee637462603c3cc54b6a0a8ea77511d3666ae05636dc477b24eeafedf7340 gaim-2.0.0_beta3-r1.ebuild 6441
-MISC ChangeLog 57531 RMD160 794b4f9c5a60eedec884eced5f4e86910a03554a SHA1 d587c917bc16bdb1419a9d6587b7f0e83b0d17b1 SHA256 7afcc17fbb6dc93cf14901ee3dbd92dc730ae8e10dfb39002727e31580357873
-MD5 e628a0c125b6f609df2e3e3894254034 ChangeLog 57531
-RMD160 794b4f9c5a60eedec884eced5f4e86910a03554a ChangeLog 57531
-SHA256 7afcc17fbb6dc93cf14901ee3dbd92dc730ae8e10dfb39002727e31580357873 ChangeLog 57531
+EBUILD gaim-1.5.0.ebuild 4040 RMD160 a3dc2aa0459198bb80b3cb704e28875e35ed2386 SHA1 69334f8a0feb79cce03b153ce93d29369bd91251 SHA256 22d683106d6f1ff173ee26dbd711b40940488c0842464b21e62471f8da69c964
+MD5 62ebc38e159f6c72332f63edf42722c3 gaim-1.5.0.ebuild 4040
+RMD160 a3dc2aa0459198bb80b3cb704e28875e35ed2386 gaim-1.5.0.ebuild 4040
+SHA256 22d683106d6f1ff173ee26dbd711b40940488c0842464b21e62471f8da69c964 gaim-1.5.0.ebuild 4040
+EBUILD gaim-2.0.0_beta3-r1.ebuild 6129 RMD160 a837801e51cf677daea9ac2b663a373f2c3b6b50 SHA1 081093f2fd27b1f23cfa8add66c4a0d546f4ac23 SHA256 622f71cbd18e08a1b05fcb1a5c768817459c1a1efc167c35b4a17848809b603b
+MD5 e87936c996ecf34403569e447aefee98 gaim-2.0.0_beta3-r1.ebuild 6129
+RMD160 a837801e51cf677daea9ac2b663a373f2c3b6b50 gaim-2.0.0_beta3-r1.ebuild 6129
+SHA256 622f71cbd18e08a1b05fcb1a5c768817459c1a1efc167c35b4a17848809b603b gaim-2.0.0_beta3-r1.ebuild 6129
+MISC ChangeLog 57681 RMD160 cafe9acb77c1de6cfdbc4f45e8d3f83d1c1fe2ec SHA1 9b4469e626ab4c94608d086cb35d7e09a0d77c32 SHA256 c04c8d46281d707698f99e25c9170d899a107f143584e3027ecb20b3ed89d7bc
+MD5 28b9b65ef58ae7a104bf148e7c67f5a0 ChangeLog 57681
+RMD160 cafe9acb77c1de6cfdbc4f45e8d3f83d1c1fe2ec ChangeLog 57681
+SHA256 c04c8d46281d707698f99e25c9170d899a107f143584e3027ecb20b3ed89d7bc ChangeLog 57681
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
diff --git a/net-im/gaim/gaim-1.5.0.ebuild b/net-im/gaim/gaim-1.5.0.ebuild
index d11d2ac9a99d..786844da0738 100644
--- a/net-im/gaim/gaim-1.5.0.ebuild
+++ b/net-im/gaim/gaim-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.5.0.ebuild,v 1.13 2006/06/30 12:19:35 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.5.0.ebuild,v 1.14 2006/07/03 12:07:22 gothgirl Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug multilib perl-module
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="nls perl spell nas cjk gnutls silc eds krb4 tcltk debug"
+IUSE="nls perl spell nas cjk gnutls silc eds tcltk debug"
 
 RDEPEND=">=x11-libs/gtk+-2.0
 	>=dev-libs/glib-2.0
@@ -24,9 +24,8 @@ RDEPEND=">=x11-libs/gtk+-2.0
 	!gnutls? ( >=dev-libs/nss-3.9.2-r2 )
 	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
 	eds? ( gnome-extra/evolution-data-server )
-	krb4? ( >=app-crypt/mit-krb5-1.3.6-r1 )
 	tcltk? ( dev-lang/tcl
-			dev-lang/tk )
+		dev-lang/tk )
 	x11-libs/startup-notification"
 
 DEPEND="$RDEPEND
@@ -80,13 +79,6 @@ print_gaim_warning() {
 
 pkg_setup() {
 	print_gaim_warning
-	if use krb4 && ! built_with_use app-crypt/mit-krb5 krb4 ; then
-		eerror
-		eerror You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to
-		eerror enable krb4 support for the zephyr protocol in gaim.
-		eerror
-		die "Configure failed"
-	fi
 }
 
 src_unpack() {
@@ -110,7 +102,6 @@ src_compile() {
 	use nls  || myconf="${myconf} --disable-nls"
 	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
 	use eds || myconf="${myconf} --disable-gevolution"
-	use krb4 && myconf="${myconf} --with-krb4"
 	use tcltk || myconf="${myconf} --disable-tcl --disable-tk"
 
 	if use gnutls ; then
diff --git a/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild b/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild
index 26df2930f033..260cf26dd016 100644
--- a/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild,v 1.4 2006/07/01 19:16:17 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild,v 1.5 2006/07/03 12:07:22 gothgirl Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-module
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/gaim/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi audiofile bonjour cjk dbus debug eds gadu gnutls krb4 meanwhile mono nas nls perl silc spell startup-notification tcltk xscreensaver custom-flags"
+IUSE="avahi audiofile bonjour cjk dbus debug eds gadu gnutls meanwhile mono nas nls perl silc spell startup-notification tcltk xscreensaver custom-flags"
 
 RDEPEND="
 	audiofile? ( media-libs/libao
@@ -35,7 +35,6 @@ RDEPEND="
 	meanwhile? ( net-libs/meanwhile )
 	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
 	eds? ( gnome-extra/evolution-data-server )
-	krb4? ( >=app-crypt/mit-krb5-1.3.6-r1 )
 	tcltk? ( dev-lang/tcl
 		dev-lang/tk )
 	startup-notification? ( >=x11-libs/startup-notification-0.5 )
@@ -117,14 +116,6 @@ print_gaim_warning() {
 pkg_setup() {
 	print_gaim_warning
 
-	if use krb4 && ! built_with_use app-crypt/mit-krb5 krb4 ; then
-	eerror
-	eerror You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to
-	eerror enable krb4 support for the zephyr protocol in gaim.
-	eerror
-	die "Configure failed"
-	fi
-
 	if use avahi && ! built_with_use net-dns/avahi howl-compat ; then
 	eerror
 	eerror You need to rebuild net-dns/avavhi with USE=howl-compat in order
@@ -199,7 +190,6 @@ src_compile() {
 		$(use_enable tcltk tk) \
 		$(use_enable xscreensaver screensaver) \
 		$(use_enable mono) \
-		$(use_enable krb4) \
 		$(use_enable debug) \
 		$(use_enable dbus) \
 		$(use_enable meanwhile) \